// 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/DE/DE_ConfigurationContext.cxx

@@ -295,18 +295,6 @@ TCollection_AsciiString DE_ConfigurationContext::StringVal(const TCollection_Asc
   return GetString(theParam, aVal, theScope) ? aVal : theDefValue;
 }
 
-//=======================================================================
-//function : StringSeqVal
-//purpose  :
-//=======================================================================
-TColStd_ListOfAsciiString DE_ConfigurationContext::StringSeqVal(const TCollection_AsciiString& theParam,
-                                                                const TColStd_ListOfAsciiString& theDefValue,
-                                                                const TCollection_AsciiString& theScope) const
-{
-  TColStd_ListOfAsciiString aVal;
-  return GetStringSeq(theParam, aVal, theScope) ? aVal : theDefValue;
-}
-
 //=======================================================================
 //function : GetReal
 //purpose  :

src/DE/DE_ConfigurationContext.hxx

@@ -139,15 +139,6 @@ public:
                                                     const TCollection_AsciiString& theDefValue,
                                                     const TCollection_AsciiString& theScope = "") const;
 
-  //! Gets value of parameter as being of specific type
-  //! @param[in] theParam complex parameter name
-  //! @param[in] theDefValue value by default if param is not found or has wrong type
-  //! @param[in] theScope base parameter name
-  //! @return specific type value
-  Standard_EXPORT TColStd_ListOfAsciiString StringSeqVal(const TCollection_AsciiString& theParam,
-                                                         const TColStd_ListOfAsciiString& theDefValue,
-                                                         const TCollection_AsciiString& theScope = "") const;
-
   //! Gets internal resource map
   //! @return map with resource value
   Standard_EXPORT const DE_ResourceMap& GetInternalMap() const { return myResource; }

src/DE/DE_ConfigurationNode.cxx

@@ -114,15 +114,6 @@ bool DE_ConfigurationNode::IsExportSupported() const
   return false;
 }
 
-//=======================================================================
-// function : IsExportSupported
-// purpose  :
-//=======================================================================
-bool DE_ConfigurationNode::IsStreamSupported() const
-{
-  return false;
-}
-
 //=======================================================================
 // function : CheckForSupport
 // purpose  :

src/DE/DE_ConfigurationNode.hxx

@@ -102,10 +102,6 @@ public:
   //! @return Standard_True if export is support
   Standard_EXPORT virtual bool IsExportSupported() const;
 
-  //! Checks the stream for import/export supporting
-  //! @return Standard_True if stream is support
-  Standard_EXPORT virtual bool IsStreamSupported() const;
-
   //! Gets CAD format name of associated provider
   //! @return provider CAD format
   Standard_EXPORT virtual TCollection_AsciiString GetFormat() const = 0;
@@ -132,11 +128,17 @@ public:
 
   //! Gets the provider loading status
   //! @return Standard_True if the load is correct
-  Standard_Boolean IsEnabled() const { return myIsEnabled; }
+  Standard_Boolean IsEnabled() const
+  {
+    return myIsEnabled;
+  }
 
   //! Sets the provider loading status
   //! @param[in] theIsLoaded input load status
-  void SetEnabled(const Standard_Boolean theIsLoaded) { myIsEnabled = theIsLoaded; }
+  void SetEnabled(const Standard_Boolean theIsLoaded)
+  {
+    myIsEnabled = theIsLoaded;
+  }
 
 public:
 

src/DE/DE_Provider.cxx

@@ -47,27 +47,7 @@ Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
   (void)theWS;
   (void)theProgress;
   Message::SendFail() << "Error: provider " << GetFormat() <<
-    " " << GetVendor() << " doesn't support read operation";
-  return Standard_False;
-}
-
-//=======================================================================
-// function : Read
-// purpose  :
-//=======================================================================
-bool DE_Provider::Read(std::istream& theIStream,
-                       const Handle(TDocStd_Document)& theDocument,
-                       const TCollection_AsciiString theName,
-                       Handle(XSControl_WorkSession)& theWS,
-                       const Message_ProgressRange& theProgress)
-{
-  (void)theIStream;
-  (void)theDocument;
-  (void)theName;
-  (void)theWS;
-  (void)theProgress;
-  Message::SendFail() << "Error: provider " << GetFormat() <<
-    " " << GetVendor() << " doesn't support stream read operation";
+    " " << GetVendor() <<" doesn't support read operation";
   return Standard_False;
 }
 
@@ -89,21 +69,35 @@ Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
   return Standard_False;
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
+                                   const Handle(TDocStd_Document)& theDocument,
+                                   const Message_ProgressRange& theProgress)
+{
+  (void)thePath;
+  (void)theDocument;
+  (void)theProgress;
+  Message::SendFail() << "Error: provider " << GetFormat() <<
+    " " << GetVendor() << " doesn't support read operation";
+  return Standard_False;
+}
+
 //=======================================================================
 // function : Write
 // purpose  :
 //=======================================================================
-bool DE_Provider::Write(std::ostream& theOStream,
-                        const Handle(TDocStd_Document)& theDocument,
-                        Handle(XSControl_WorkSession)& theWS,
-                        const Message_ProgressRange& theProgress)
+Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress)
 {
-  (void)theOStream;
+  (void)thePath;
   (void)theDocument;
-  (void)theWS;
   (void)theProgress;
   Message::SendFail() << "Error: provider " << GetFormat() <<
-    " " << GetVendor() << " doesn't support stream write operation";
+    " " << GetVendor() << " doesn't support write operation";
   return Standard_False;
 }
 
@@ -125,26 +119,6 @@ Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
   return Standard_False;
 }
 
-//=======================================================================
-// function : Read
-// purpose  :
-//=======================================================================
-bool DE_Provider::Read(std::istream& theIStream,
-                       TopoDS_Shape& theShape,
-                       const TCollection_AsciiString theName,
-                       Handle(XSControl_WorkSession)& theWS,
-                       const Message_ProgressRange& theProgress)
-{
-  (void)theIStream;
-  (void)theShape;
-  (void)theName;
-  (void)theWS;
-  (void)theProgress;
-  Message::SendFail() << "Error: provider " << GetFormat() <<
-    " " << GetVendor() << " doesn't support stream read operation";
-  return Standard_False;
-}
-
 //=======================================================================
 // function : Write
 // purpose  :
@@ -163,20 +137,34 @@ Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
   return Standard_False;
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+Standard_Boolean DE_Provider::Read(const TCollection_AsciiString& thePath,
+                                   TopoDS_Shape& theShape,
+                                   const Message_ProgressRange& theProgress)
+{
+  (void)thePath;
+  (void)theShape;
+  (void)theProgress;
+  Message::SendFail() << "Error: provider " << GetFormat() <<
+    " " << GetVendor() << " doesn't support read operation";
+  return Standard_False;
+}
+
 //=======================================================================
 // function : Write
 // purpose  :
 //=======================================================================
-bool DE_Provider::Write(std::ostream& theOStream,
-                        const TopoDS_Shape& theShape,
-                        Handle(XSControl_WorkSession)& theWS,
-                        const Message_ProgressRange& theProgress)
+Standard_Boolean DE_Provider::Write(const TCollection_AsciiString& thePath,
+                                    const TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress)
 {
-  (void)theOStream;
+  (void)thePath;
   (void)theShape;
-  (void)theWS;
   (void)theProgress;
   Message::SendFail() << "Error: provider " << GetFormat() <<
-    " " << GetVendor() << " doesn't support stream write operation";
+    " " << GetVendor() << " doesn't support write operation";
   return Standard_False;
 }

src/DE/DE_Provider.hxx

@@ -61,23 +61,10 @@ public:
   //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
   //! @return True if Read was successful
-  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
-                                    const Handle(TDocStd_Document)& theDocument,
-                                    Handle(XSControl_WorkSession)& theWS,
-                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
-
-  //! Reads a CAD file, according internal configuration
-  //! @param[in] theIStream stream to import CAD data
-  //! @param[out] theDocument document to save result
-  //! @paramp[in] theName name of CAD file, can be empty
-  //! @param[in] theWS current work session
-  //! @param theProgress[in] progress indicator
-  //! @return true if Read operation has ended correctly
-  Standard_EXPORT virtual bool Read(std::istream& theIStream,
-                                    const Handle(TDocStd_Document)& theDocument,
-                                    const TCollection_AsciiString theName,
-                                    Handle(XSControl_WorkSession)& theWS,
-                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
+  Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                                const Handle(TDocStd_Document)& theDocument,
+                                                Handle(XSControl_WorkSession)& theWS,
+                                                const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Writes a CAD file, according internal configuration
   //! @param[in] thePath path to the export CAD file
@@ -85,21 +72,28 @@ public:
   //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
   //! @return True if Write was successful
-  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
-                                     const Handle(TDocStd_Document)& theDocument,
-                                     Handle(XSControl_WorkSession)& theWS,
-                                     const Message_ProgressRange& theProgress = Message_ProgressRange());
+  Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                                 const Handle(TDocStd_Document)& theDocument,
+                                                 Handle(XSControl_WorkSession)& theWS,
+                                                 const Message_ProgressRange& theProgress = Message_ProgressRange());
+
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return True if Read was successful
+  Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                                const Handle(TDocStd_Document)& theDocument,
+                                                const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Writes a CAD file, according internal configuration
-  //! @param[in] theOStream stream to export CAD data
+  //! @param[in] thePath path to the export CAD file
   //! @param[out] theDocument document to export
-  //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
-  //! @return true if Write operation has ended correctly
-  Standard_EXPORT virtual bool Write(std::ostream& theOStream,
-                                     const Handle(TDocStd_Document)& theDocument,
-                                     Handle(XSControl_WorkSession)& theWS,
-                                     const Message_ProgressRange& theProgress = Message_ProgressRange());
+  //! @return True if Write was successful
+  Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                                 const Handle(TDocStd_Document)& theDocument,
+                                                 const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
@@ -107,23 +101,10 @@ public:
   //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
   //! @return True if Read was successful
-  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
-                                    TopoDS_Shape& theShape,
-                                    Handle(XSControl_WorkSession)& theWS,
-                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
-
-  //! Reads a CAD file, according internal configuration
-  //! @param[in] theIStream stream to the CAD file
-  //! @param[out] theShape shape to save result
-  //! @paramp[in] theName name of CAD file, can be empty
-  //! @param[in] theWS current work session
-  //! @param theProgress[in] progress indicator
-  //! @return true if Read operation has ended correctly
-  Standard_EXPORT virtual bool Read(std::istream& theIStream,
-                                    TopoDS_Shape& theShape,
-                                    const TCollection_AsciiString theName,
-                                    Handle(XSControl_WorkSession)& theWS,
-                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
+  Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                                TopoDS_Shape& theShape,
+                                                Handle(XSControl_WorkSession)& theWS,
+                                                const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Writes a CAD file, according internal configuration
   //! @param[in] thePath path to the export CAD file
@@ -131,21 +112,28 @@ public:
   //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
   //! @return True if Write was successful
-  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
-                                     const TopoDS_Shape& theShape,
-                                     Handle(XSControl_WorkSession)& theWS,
-                                     const Message_ProgressRange& theProgress = Message_ProgressRange());
+  Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                                 const TopoDS_Shape& theShape,
+                                                 Handle(XSControl_WorkSession)& theWS,
+                                                 const Message_ProgressRange& theProgress = Message_ProgressRange());
+
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return True if Read was successful
+  Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                                TopoDS_Shape& theShape,
+                                                const Message_ProgressRange& theProgress = Message_ProgressRange());
 
   //! Writes a CAD file, according internal configuration
-  //! @param[in] theOStream stream to export CAD data
+  //! @param[in] thePath path to the export CAD file
   //! @param[out] theShape shape to export
-  //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
-  //! @return true if Write operation has ended correctly
-  Standard_EXPORT virtual bool Write(std::ostream& theOStream,
-                                     const TopoDS_Shape& theShape,
-                                     Handle(XSControl_WorkSession)& theWS,
-                                     const Message_ProgressRange& theProgress = Message_ProgressRange());
+  //! @return True if Write was successful
+  Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                                 const TopoDS_Shape& theShape,
+                                                 const Message_ProgressRange& theProgress = Message_ProgressRange());
 
 public:
 
@@ -159,11 +147,17 @@ public:
 
   //! Gets internal configuration node
   //! @return configuration node object
-  Handle(DE_ConfigurationNode) GetNode() const { return myNode; }
+  Handle(DE_ConfigurationNode) GetNode() const
+  {
+    return myNode;
+  }
 
   //! Sets internal configuration node
   //! @param[in] theNode configuration node to set
-  void SetNode(const Handle(DE_ConfigurationNode)& theNode) { myNode = theNode; }
+  void SetNode(const Handle(DE_ConfigurationNode)& theNode)
+  {
+    myNode = theNode;
+  }
 
 private:
 

src/DE/DE_Wrapper.cxx

@@ -31,7 +31,7 @@ namespace
 {
   static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
   {
-    static const TCollection_AsciiString aScope("global");
+    static const TCollection_AsciiString aScope ("global");
     return aScope;
   }
 
@@ -109,6 +109,10 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
   {
     return Standard_False;
   }
+  if (theWS.IsNull())
+  {
+    return Read(thePath, theDocument, theProgress);
+  }
   Handle(DE_Provider) aProvider;
   if (!FindProvider(thePath, Standard_True, aProvider))
   {
@@ -130,6 +134,10 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
   {
     return Standard_False;
   }
+  if (theWS.IsNull())
+  {
+    return Write(thePath, theDocument, theProgress);
+  }
   Handle(DE_Provider) aProvider;
   if (!FindProvider(thePath, Standard_False, aProvider))
   {
@@ -138,6 +146,46 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
   return aProvider->Write(thePath, theDocument, theWS, theProgress);
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
+                                  const Handle(TDocStd_Document)& theDocument,
+                                  const Message_ProgressRange& theProgress)
+{
+  if (theDocument.IsNull())
+  {
+    return Standard_False;
+  }
+  Handle(DE_Provider) aProvider;
+  if (!FindProvider(thePath, Standard_True, aProvider))
+  {
+    return Standard_False;
+  }
+  return aProvider->Read(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
+                                   const Handle(TDocStd_Document)& theDocument,
+                                   const Message_ProgressRange& theProgress)
+{
+  if (theDocument.IsNull())
+  {
+    return Standard_False;
+  }
+  Handle(DE_Provider) aProvider;
+  if (!FindProvider(thePath, Standard_False, aProvider))
+  {
+    return Standard_False;
+  }
+  return aProvider->Write(thePath, theDocument, theProgress);
+}
+
 //=======================================================================
 // function : Read
 // purpose  :
@@ -147,6 +195,10 @@ Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
                                   Handle(XSControl_WorkSession)& theWS,
                                   const Message_ProgressRange& theProgress)
 {
+  if (theWS.IsNull())
+  {
+    return Read(thePath, theShape, theProgress);
+  }
   Handle(DE_Provider) aProvider;
   if (!FindProvider(thePath, Standard_True, aProvider))
   {
@@ -164,6 +216,10 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
                                    Handle(XSControl_WorkSession)& theWS,
                                    const Message_ProgressRange& theProgress)
 {
+  if (theWS.IsNull())
+  {
+    return Write(thePath, theShape, theProgress);
+  }
   Handle(DE_Provider) aProvider;
   if (!FindProvider(thePath, Standard_False, aProvider))
   {
@@ -172,6 +228,39 @@ Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
   return aProvider->Write(thePath, theShape, theWS, theProgress);
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+Standard_Boolean DE_Wrapper::Read(const TCollection_AsciiString& thePath,
+                                  TopoDS_Shape& theShape,
+                                  const Message_ProgressRange& theProgress)
+{
+
+  Handle(DE_Provider) aProvider;
+  if (!FindProvider(thePath, Standard_True, aProvider))
+  {
+    return Standard_False;
+  }
+  return aProvider->Read(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+Standard_Boolean DE_Wrapper::Write(const TCollection_AsciiString& thePath,
+                                   const TopoDS_Shape& theShape,
+                                   const Message_ProgressRange& theProgress)
+{
+  Handle(DE_Provider) aProvider;
+  if (!FindProvider(thePath, Standard_False, aProvider))
+  {
+    return Standard_False;
+  }
+  return aProvider->Write(thePath, theShape, theProgress);
+}
+
 //=======================================================================
 // function : Load
 // purpose  :

src/DE/DE_Wrapper.hxx

@@ -94,6 +94,24 @@ public:
                                          Handle(XSControl_WorkSession)& theWS,
                                          const Message_ProgressRange& theProgress = Message_ProgressRange());
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                        const Handle(TDocStd_Document)& theDocument,
+                                        const Message_ProgressRange& theProgress = Message_ProgressRange());
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                         const Handle(TDocStd_Document)& theDocument,
+                                         const Message_ProgressRange& theProgress = Message_ProgressRange());
+
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
   //! @param[out] theShape shape to save result
@@ -116,6 +134,24 @@ public:
                                          Handle(XSControl_WorkSession)& theWS,
                                          const Message_ProgressRange& theProgress = Message_ProgressRange());
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                        TopoDS_Shape& theShape,
+                                        const Message_ProgressRange& theProgress = Message_ProgressRange());
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                         const TopoDS_Shape& theShape,
+                                         const Message_ProgressRange& theProgress = Message_ProgressRange());
+
 public:
 
   //! Updates values according the resource file

src/DEBRepCascade/DEBRepCascade_Provider.cxx

@@ -51,21 +51,7 @@ bool DEBRepCascade_Provider::Read(const TCollection_AsciiString& thePath,
                                   const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (theDocument.IsNull())
-  {
-    Message::SendFail() << "Error: DEBRepCascade_Provider : "
-      << "Null document";
-    return false;
-  }
-  TopoDS_Shape aShape;
-  if (!Read(thePath, aShape, theWS, theProgress))
-  {
-    return false;
-  }
-  Handle(XCAFDoc_ShapeTool) aShTool =
-    XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
-  aShTool->AddShape(aShape);
-  return true;
+  return Read(thePath, theDocument, theProgress);
 }
 
 //=======================================================================
@@ -78,15 +64,49 @@ bool DEBRepCascade_Provider::Write(const TCollection_AsciiString& thePath,
                                    const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Write(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool DEBRepCascade_Provider::Read(const TCollection_AsciiString& thePath,
+                                  const Handle(TDocStd_Document)& theDocument,
+                                  const Message_ProgressRange& theProgress)
+{
+  if(theDocument.IsNull())
+  {
+    Message::SendFail() << "Error in the DEBRepCascade_Provider during reading the file " <<
+      thePath << "\t: theDocument shouldn't be null";
+    return false;
+  }
+  TopoDS_Shape aShape;
+  if (!Read(thePath, aShape, theProgress))
+  {
+    return false;
+  }
+  Handle(XCAFDoc_ShapeTool) aShTool = XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
+  aShTool->AddShape(aShape);
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool DEBRepCascade_Provider::Write(const TCollection_AsciiString& thePath,
+                                   const Handle(TDocStd_Document)& theDocument,
+                                   const Message_ProgressRange& theProgress)
+{
   TopoDS_Shape aShape;
   TDF_LabelSequence aLabels;
-  Handle(XCAFDoc_ShapeTool) aSTool =
-    XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
+  Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
   aSTool->GetFreeShapes(aLabels);
   if (aLabels.Length() <= 0)
   {
-    Message::SendFail() << "Error: DEBRepCascade_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+      thePath << "\t: Document contain no shapes";
     return false;
   }
 
@@ -106,7 +126,7 @@ bool DEBRepCascade_Provider::Write(const TCollection_AsciiString& thePath,
     }
     aShape = aComp;
   }
-  return Write(thePath, aShape, theWS, theProgress);
+  return Write(thePath, aShape, theProgress);
 }
 
 //=======================================================================
@@ -119,45 +139,7 @@ bool DEBRepCascade_Provider::Read(const TCollection_AsciiString& thePath,
                                   const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  bool isBinaryFormat = true;
-  {
-    // probe file header to recognize format
-    const Handle(OSD_FileSystem)& aFileSystem =
-      OSD_FileSystem::DefaultFileSystem();
-    std::shared_ptr<std::istream> aFile =
-      aFileSystem->OpenIStream(thePath, std::ios::in | std::ios::binary);
-    if (aFile.get() == NULL)
-    {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Cannot open the file";
-      return false;
-    }
-    char aStringBuf[255] = {};
-    aFile->read(aStringBuf, 255);
-    if (aFile->fail())
-    {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Cannot open the file";
-      return false;
-    }
-    isBinaryFormat = !(::strncmp(aStringBuf, "DBRep_DrawableShape", 19) == 0);
-  }
-  Standard_Boolean aReadStatus = Standard_True;
-  if (isBinaryFormat)
-  {
-    aReadStatus = BinTools::Read(theShape, thePath.ToCString(), theProgress);
-  }
-  else
-  {
-    aReadStatus =
-      BRepTools::Read(theShape, thePath.ToCString(), BRep_Builder(), theProgress);
-  }
-  if (!aReadStatus)
-  {
-    Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-      << thePath << "] : Cannot read data from the file";
-  }
-  return aReadStatus;
+  return Read(thePath, theShape, theProgress);
 }
 
 //=======================================================================
@@ -170,72 +152,127 @@ bool DEBRepCascade_Provider::Write(const TCollection_AsciiString& thePath,
                                    const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(DEBRepCascade_ConfigurationNode)))
+  return Write(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool DEBRepCascade_Provider::Read(const TCollection_AsciiString& thePath,
+                                  TopoDS_Shape& theShape,
+                                  const Message_ProgressRange& theProgress)
+{
+  bool isBinaryFormat = true;
   {
-    Message::SendFail() << "Error: DEBRepCascade_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(DEBRepCascade_ConfigurationNode) aNode =
-    Handle(DEBRepCascade_ConfigurationNode)::DownCast(GetNode());
-  if (aNode->InternalParameters.WriteBinary)
-  {
-    if (aNode->InternalParameters.WriteVersionBin >
-        static_cast<BinTools_FormatVersion>(BinTools_FormatVersion_UPPER) ||
-        aNode->InternalParameters.WriteVersionBin <
-        static_cast<BinTools_FormatVersion>(BinTools_FormatVersion_LOWER))
+    // probe file header to recognize format
+    const Handle(OSD_FileSystem)& aFileSystem = OSD_FileSystem::DefaultFileSystem();
+    std::shared_ptr<std::istream> aFile = aFileSystem->OpenIStream(thePath, std::ios::in | std::ios::binary);
+    if (aFile.get() == NULL)
     {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Unknown format version";
-      return false;
-    }
-    if (aNode->InternalParameters.WriteNormals &&
-        aNode->InternalParameters.WriteVersionBin < BinTools_FormatVersion_VERSION_4)
-    {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Vertex normals require binary format version 4 or later";
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during reading the file " <<
+        thePath << "\t: Cannot read the file";
       return false;
     }
 
-    if (!BinTools::Write(theShape, thePath.ToCString(),
-        aNode->InternalParameters.WriteTriangles,
-        aNode->InternalParameters.WriteNormals,
-        aNode->InternalParameters.WriteVersionBin, theProgress))
+    char aStringBuf[255] = {};
+    aFile->read(aStringBuf, 255);
+    if (aFile->fail())
     {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Cannot write the file";
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during reading the file " <<
+        thePath << "\t: Cannot read the file";
+      return false;
+    }
+    isBinaryFormat = !(::strncmp(aStringBuf, "DBRep_DrawableShape", 19) == 0);
+  }
+
+  if (isBinaryFormat)
+  {
+    if (!BinTools::Read(theShape, thePath.ToCString(), theProgress))
+    {
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during reading the file " <<
+        thePath << "\t: Cannot read from the file";
       return false;
     }
   }
   else
   {
-    if (aNode->InternalParameters.WriteVersionAscii >
-        static_cast<TopTools_FormatVersion>(TopTools_FormatVersion_UPPER) ||
-        aNode->InternalParameters.WriteVersionAscii <
-        static_cast<TopTools_FormatVersion>(TopTools_FormatVersion_LOWER))
+    if (!BRepTools::Read(theShape, thePath.ToCString(), BRep_Builder(), theProgress))
     {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Unknown format version";
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during reading the file " <<
+        thePath << "\t: Cannot read from the file";
+      return false;
+    }
+  }
+
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool DEBRepCascade_Provider::Write(const TCollection_AsciiString& thePath,
+                                   const TopoDS_Shape& theShape,
+                                   const Message_ProgressRange& theProgress)
+{
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(DEBRepCascade_ConfigurationNode)))
+  {
+    Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return false;
+  }
+  Handle(DEBRepCascade_ConfigurationNode) aNode = Handle(DEBRepCascade_ConfigurationNode)::DownCast(GetNode());
+  if (aNode->InternalParameters.WriteBinary)
+  {
+    if (aNode->InternalParameters.WriteVersionBin > static_cast<BinTools_FormatVersion>(BinTools_FormatVersion_UPPER) ||
+        aNode->InternalParameters.WriteVersionBin < static_cast<BinTools_FormatVersion>(BinTools_FormatVersion_LOWER))
+    {
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+        thePath << "\t: Unknown format version";
+      return false;
+    }
+    if (aNode->InternalParameters.WriteNormals && 
+        aNode->InternalParameters.WriteVersionBin < BinTools_FormatVersion_VERSION_4)
+    {
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+        thePath << "\t: Vertex normals require binary format version 4 or later";
+      return false;
+    }
+
+    if (!BinTools::Write(theShape, thePath.ToCString(), aNode->InternalParameters.WriteTriangles,
+        aNode->InternalParameters.WriteNormals, aNode->InternalParameters.WriteVersionBin, theProgress))
+    {
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+        thePath << "\t: Cannot write the file";
+      return false;
+    }
+  }
+  else
+  {
+    if (aNode->InternalParameters.WriteVersionAscii > static_cast<TopTools_FormatVersion>(TopTools_FormatVersion_UPPER) ||
+        aNode->InternalParameters.WriteVersionAscii < static_cast<TopTools_FormatVersion>(TopTools_FormatVersion_LOWER))
+    {
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+        thePath << "\t: Unknown format version";
       return false;
     }
     if (aNode->InternalParameters.WriteNormals &&
         aNode->InternalParameters.WriteVersionAscii < TopTools_FormatVersion_VERSION_3)
     {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Vertex normals require ascii format version 3 or later";
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+        thePath << "\t: Error: vertex normals require ascii format version 3 or later";
       return false;
     }
-    if (!BRepTools::Write(theShape, thePath.ToCString(),
-        aNode->InternalParameters.WriteTriangles,
-        aNode->InternalParameters.WriteNormals,
-        aNode->InternalParameters.WriteVersionAscii, theProgress))
+    if (!BRepTools::Write(theShape, thePath.ToCString(), aNode->InternalParameters.WriteTriangles,
+        aNode->InternalParameters.WriteNormals, aNode->InternalParameters.WriteVersionAscii, theProgress))
     {
-      Message::SendFail() << "Error: DEBRepCascade_Provider : ["
-        << thePath << "] : Cannot write the file";
+      Message::SendFail() << "Error in the DEBRepCascade_Provider during writing the file " <<
+        thePath << "\t: Cannot write the file";
       return false;
     }
   }
+
   return true;
 }
 

src/DEBRepCascade/DEBRepCascade_Provider.hxx

@@ -64,6 +64,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const Handle(TDocStd_Document)& theDocument,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
   //! @param[out] theShape shape to save result
@@ -86,6 +104,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const TopoDS_Shape& theShape,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider

src/DEXCAFCascade/DEXCAFCascade_Provider.cxx

@@ -59,21 +59,43 @@ bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
                                   const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Read(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool DEXCAFCascade_Provider::Write(const TCollection_AsciiString& thePath,
+                                   const Handle(TDocStd_Document)& theDocument,
+                                   Handle(XSControl_WorkSession)& theWS,
+                                   const Message_ProgressRange& theProgress)
+{
+  (void)theWS;
+  return Write(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
+                                  const Handle(TDocStd_Document)& theDocument,
+                                  const Message_ProgressRange& theProgress)
+{
   if (theDocument.IsNull())
   {
-    Message::SendFail() << "Error: DEXCAFCascade_Provider : "
-      << "Null document";
+    Message::SendFail() << "Error in the DEXCAFCascade_Provider during reading the file " <<
+      thePath << "\t: theDocument shouldn't be null";
     return false;
   }
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(DEXCAFCascade_ConfigurationNode)))
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(DEXCAFCascade_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: DEXCAFCascade_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the DEXCAFCascade_Provider during reading the file " << thePath
+      << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(DEXCAFCascade_ConfigurationNode) aNode =
-    Handle(DEXCAFCascade_ConfigurationNode)::DownCast(GetNode());
+  Handle(DEXCAFCascade_ConfigurationNode) aNode = Handle(DEXCAFCascade_ConfigurationNode)::DownCast(GetNode());
   Handle(TDocStd_Document) aDocument;
   Handle(TDocStd_Application) anApp = new TDocStd_Application();
   BinDrivers::DefineFormat(anApp);
@@ -86,15 +108,12 @@ bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
   XmlLDrivers::DefineFormat(anApp);
   XmlTObjDrivers::DefineFormat(anApp);
   XmlXCAFDrivers::DefineFormat(anApp);
-  Handle(PCDM_ReaderFilter) aFilter =
-    new PCDM_ReaderFilter(aNode->InternalParameters.ReadAppendMode);
-  for (TColStd_ListOfAsciiString::Iterator anIt(aNode->InternalParameters.ReadSkipValues);
-       anIt.More(); anIt.Next())
+  Handle(PCDM_ReaderFilter) aFilter = new PCDM_ReaderFilter(aNode->InternalParameters.ReadAppendMode);
+  for (TColStd_ListOfAsciiString::Iterator anIt(aNode->InternalParameters.ReadSkipValues); anIt.More(); anIt.Next())
   {
     aFilter->AddSkipped(anIt.Value());
   }
-  for (TColStd_ListOfAsciiString::Iterator anIt(aNode->InternalParameters.ReadValues);
-       anIt.More(); anIt.Next())
+  for (TColStd_ListOfAsciiString::Iterator anIt(aNode->InternalParameters.ReadValues); anIt.More(); anIt.Next())
   {
     if (anIt.Value().StartsWith("0"))
     {
@@ -108,8 +127,8 @@ bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
 
   if (anApp->Open(thePath, aDocument, aFilter, theProgress) != PCDM_RS_OK)
   {
-    Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-      thePath << "] : Cannot open XDE document";
+    Message::SendFail() << "Error in the DEXCAFCascade_Provider during reading the file : " << thePath
+      << "\t: Cannot open XDE document";
     return false;
   }
   theDocument->SetData(aDocument->GetData());
@@ -122,10 +141,8 @@ bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
 //=======================================================================
 bool DEXCAFCascade_Provider::Write(const TCollection_AsciiString& thePath,
                                    const Handle(TDocStd_Document)& theDocument,
-                                   Handle(XSControl_WorkSession)& theWS,
                                    const Message_ProgressRange& theProgress)
 {
-  (void)theWS;
   Handle(TDocStd_Application) anApp = new TDocStd_Application();
   BinXCAFDrivers::DefineFormat(anApp);
   PCDM_StoreStatus aStatus = PCDM_SS_Doc_IsNull;
@@ -135,50 +152,50 @@ bool DEXCAFCascade_Provider::Write(const TCollection_AsciiString& thePath,
   }
   else if (!theDocument->IsSaved())
   {
-    Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-      thePath << "] : Storage error : Document has never been saved";
+    Message::SendFail() << "Storage error in the DEXCAFCascade_Provider during writing the file " <<
+      thePath << "\t: Storage error : this document has never been saved";
     return false;
   }
   else
   {
     aStatus = anApp->Save(theDocument, theProgress);
   }
+
   switch (aStatus)
   {
     case PCDM_SS_OK:
       return true;
     case PCDM_SS_DriverFailure:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : driver failure";
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during writing the file : " << thePath
+        << "\t: Storage error : driver failure";
       break;
     case PCDM_SS_WriteFailure:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : write failure";
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during the writing the file : " << thePath
+        << "\t: Storage error : write failure";
       break;
     case PCDM_SS_Failure:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : general failure";
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during writing the file : " << thePath
+        << "\t: Storage error : general failure";
       break;
     case PCDM_SS_Doc_IsNull:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : document is NULL";
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during writing the file : " << thePath
+        << "\t: Storage error :: document is NULL";
       break;
     case PCDM_SS_No_Obj:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : no object";
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during writing the file : " << thePath
+        << "\t: Storage error : no object";
       break;
     case PCDM_SS_Info_Section_Error:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : section error";
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during writing the file : " << thePath
+        << "\t: Storage error : section error";
       break;
     case PCDM_SS_UserBreak:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : user break";
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during writing the file : " << thePath
+        << "\t: Storage error : user break";
       break;
     case PCDM_SS_UnrecognizedFormat:
-      Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-        thePath << "] : Storage error : unrecognized document storage format : "
-        << theDocument->StorageFormat();
+      Message::SendFail() << "Error in the DEXCAFCascade_Provider during writing the file : " << thePath
+        << "\t: Storage error : unrecognized document storage format : " << theDocument->StorageFormat();
       break;
   }
   return false;
@@ -194,25 +211,48 @@ bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
                                   const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(DEXCAFCascade_ConfigurationNode)))
+  return Read(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool DEXCAFCascade_Provider::Write(const TCollection_AsciiString& thePath,
+                                   const TopoDS_Shape& theShape,
+                                   Handle(XSControl_WorkSession)& theWS,
+                                   const Message_ProgressRange& theProgress)
+{
+  (void)theWS;
+  return Write(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
+                                  TopoDS_Shape& theShape,
+                                  const Message_ProgressRange& theProgress)
+{
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(DEXCAFCascade_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: DEXCAFCascade_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the DEXCAFCascade_Provider during reading the file " << thePath
+      << "\t: Incorrect or empty Configuration Node";
     return false;
   }
   Handle(TDocStd_Document) aDocument;
   Handle(TDocStd_Application) anApp = new TDocStd_Application();
   BinXCAFDrivers::DefineFormat(anApp);
   anApp->NewDocument("BinXCAF", aDocument);
-  Read(thePath, aDocument, theWS, theProgress);
+  Read(thePath, aDocument, theProgress);
   TDF_LabelSequence aLabels;
   Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool(aDocument->Main());
   aSTool->GetFreeShapes(aLabels);
   if (aLabels.Length() <= 0)
   {
-    Message::SendFail() << "Error: DEXCAFCascade_Provider : [" <<
-      thePath << "] : Storage error : Document contain no shapes";
+    Message::SendFail() << "Error in the DEXCAFCascade_Provider during reading the file : " << thePath
+      << "\t: Document contain no shapes";
     return false;
   }
 
@@ -241,14 +281,12 @@ bool DEXCAFCascade_Provider::Read(const TCollection_AsciiString& thePath,
 //=======================================================================
 bool DEXCAFCascade_Provider::Write(const TCollection_AsciiString& thePath,
                                    const TopoDS_Shape& theShape,
-                                   Handle(XSControl_WorkSession)& theWS,
                                    const Message_ProgressRange& theProgress)
 {
-  (void)theWS;
   Handle(TDocStd_Document) aDoc = new TDocStd_Document("BinXCAF");
   Handle(XCAFDoc_ShapeTool) aShTool = XCAFDoc_DocumentTool::ShapeTool(aDoc->Main());
   aShTool->AddShape(theShape);
-  return Write(thePath, aDoc, theWS, theProgress);
+  return Write(thePath, aDoc, theProgress);
 }
 
 //=======================================================================

src/DEXCAFCascade/DEXCAFCascade_Provider.hxx

@@ -64,6 +64,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const Handle(TDocStd_Document)& theDocument,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
   //! @param[out] theShape shape to save result
@@ -86,6 +104,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const TopoDS_Shape& theShape,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider

src/IGESCAFControl/IGESCAFControl_Provider.cxx

@@ -13,217 +13,19 @@
 
 #include <IGESCAFControl_Provider.hxx>
 
+#include <BinXCAFDrivers.hxx>
 #include <IGESCAFControl_ConfigurationNode.hxx>
 #include <IGESCAFControl_Reader.hxx>
 #include <IGESCAFControl_Writer.hxx>
-#include <IGESControl_Controller.hxx>
 #include <IGESData.hxx>
 #include <IGESData_IGESModel.hxx>
 #include <Interface_Static.hxx>
 #include <Message.hxx>
-#include <UnitsMethods.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
-#include <XSControl_WorkSession.hxx>
+#include <UnitsMethods.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(IGESCAFControl_Provider, DE_Provider)
 
-namespace
-{
-  //! Special class to handle static parameters.
-  //! Initialize all parameters in the begin of life
-  //! and reset changed parameters in the end of life
-  class IGESCAFControl_ParameterController
-  {
-  public:
-
-    IGESCAFControl_ParameterController(const Handle(IGESCAFControl_ConfigurationNode)& theNode,
-                                       const Standard_Boolean theUpdateStatic);
-
-    ~IGESCAFControl_ParameterController();
-
-  protected:
-
-    void setStatic(const IGESCAFControl_ConfigurationNode::IGESCAFControl_InternalSection theParameter);
-
-  private:
-
-    bool myToUpdateStaticParameters; //!< Flag to updating static parameters
-    IGESCAFControl_ConfigurationNode::IGESCAFControl_InternalSection myOldValues; //!< Container to save previous static parameters
-    IGESCAFControl_ConfigurationNode::DE_SectionGlobal myOldGlobalValues; //!< Container to save previous global parameters
-  };
-
-  //=======================================================================
-  // function : IGESCAFControl_ParameterController
-  // purpose  :
-  //=======================================================================
-  IGESCAFControl_ParameterController::IGESCAFControl_ParameterController(const Handle(IGESCAFControl_ConfigurationNode)& theNode,
-                                                                         const Standard_Boolean theUpdateStatic)
-    : myToUpdateStaticParameters(theUpdateStatic)
-  {
-    IGESControl_Controller::Init();
-    IGESData::Init();
-    if (!myToUpdateStaticParameters)
-    {
-      return;
-    }
-    // Get previous values
-    myOldValues.ReadBSplineContinuity =
-      (IGESCAFControl_ConfigurationNode::ReadMode_BSplineContinuity)
-      Interface_Static::IVal("read.iges.bspline.continuity");
-    myOldValues.ReadPrecisionMode =
-      (IGESCAFControl_ConfigurationNode::ReadMode_Precision)
-      Interface_Static::IVal("read.precision.mode");
-    myOldValues.ReadPrecisionVal =
-      Interface_Static::RVal("read.precision.val");
-    myOldValues.ReadMaxPrecisionMode =
-      (IGESCAFControl_ConfigurationNode::ReadMode_MaxPrecision)
-      Interface_Static::IVal("read.maxprecision.mode");
-    myOldValues.ReadMaxPrecisionVal =
-      Interface_Static::RVal("read.maxprecision.val");
-    myOldValues.ReadSameParamMode =
-      Interface_Static::IVal("read.stdsameparameter.mode") == 1;
-    myOldValues.ReadSurfaceCurveMode =
-      (IGESCAFControl_ConfigurationNode::ReadMode_SurfaceCurve)
-      Interface_Static::IVal("read.surfacecurve.mode");
-    myOldValues.EncodeRegAngle =
-      Interface_Static::RVal("read.encoderegularity.angle") * 180.0 / M_PI;
-
-    myOldValues.ReadApproxd1 =
-      Interface_Static::IVal("read.iges.bspline.approxd1.mode") == 1;
-    myOldValues.ReadResourceName =
-      Interface_Static::CVal("read.iges.resource.name");
-    myOldValues.ReadSequence =
-      Interface_Static::CVal("read.iges.sequence");
-    myOldValues.ReadFaultyEntities =
-      Interface_Static::IVal("read.iges.faulty.entities") == 1;
-    myOldValues.ReadOnlyVisible =
-      Interface_Static::IVal("read.iges.onlyvisible") == 1;
-
-    myOldValues.WriteBRepMode =
-      (IGESCAFControl_ConfigurationNode::WriteMode_BRep)
-      Interface_Static::IVal("write.iges.brep.mode");
-    myOldValues.WriteConvertSurfaceMode =
-      (IGESCAFControl_ConfigurationNode::WriteMode_ConvertSurface)
-      Interface_Static::IVal("write.convertsurface.mode");
-    myOldValues.WriteUnit =
-      (UnitsMethods_LengthUnit)
-      Interface_Static::IVal("write.iges.unit");
-    myOldValues.WriteHeaderAuthor =
-      Interface_Static::CVal("write.iges.header.author");
-    myOldValues.WriteHeaderCompany =
-      Interface_Static::CVal("write.iges.header.company");
-    myOldValues.WriteHeaderProduct =
-      Interface_Static::CVal("write.iges.header.product");
-    myOldValues.WriteHeaderReciever =
-      Interface_Static::CVal("write.iges.header.receiver");
-    myOldValues.WriteResourceName =
-      Interface_Static::CVal("write.iges.resource.name");
-    myOldValues.WriteSequence =
-      Interface_Static::CVal("write.iges.sequence");
-    myOldValues.WritePrecisionMode =
-      (IGESCAFControl_ConfigurationNode::WriteMode_PrecisionMode)
-      Interface_Static::IVal("write.precision.mode");
-    myOldValues.WritePrecisionVal =
-      Interface_Static::RVal("write.precision.val");
-    myOldValues.WritePlaneMode =
-      (IGESCAFControl_ConfigurationNode::WriteMode_PlaneMode)
-      Interface_Static::IVal("write.iges.plane.mode");
-    myOldValues.WriteOffsetMode =
-      Interface_Static::IVal("write.iges.offset.mode") == 1;
-
-    myOldGlobalValues.LengthUnit = 0.001 *
-      UnitsMethods::GetLengthFactorValue(Interface_Static::IVal("xstep.cascade.unit"));
-    // Set new values
-    TCollection_AsciiString aStrUnit(
-      UnitsMethods::DumpLengthUnit(theNode->GlobalParameters.LengthUnit));
-    aStrUnit.UpperCase();
-    Interface_Static::SetCVal("xstep.cascade.unit", aStrUnit.ToCString());
-    UnitsMethods::SetCasCadeLengthUnit(theNode->GlobalParameters.LengthUnit);
-    setStatic(theNode->InternalParameters);
-  }
-
-  //=======================================================================
-  // function : ~IGESCAFControl_ParameterController
-  // purpose  :
-  //=======================================================================
-  IGESCAFControl_ParameterController::~IGESCAFControl_ParameterController()
-  {
-    if (!myToUpdateStaticParameters)
-    {
-      return;
-    }
-    // Set new values
-    TCollection_AsciiString aStrUnit(
-      UnitsMethods::DumpLengthUnit(myOldGlobalValues.LengthUnit,
-      UnitsMethods_LengthUnit_Meter));
-    aStrUnit.UpperCase();
-    Interface_Static::SetCVal("xstep.cascade.unit", aStrUnit.ToCString());
-    setStatic(myOldValues);
-  }
-
-  //=======================================================================
-  // function : setStatic
-  // purpose  :
-  //=======================================================================
-  void IGESCAFControl_ParameterController::setStatic(const IGESCAFControl_ConfigurationNode::IGESCAFControl_InternalSection theParameter)
-  {
-    Interface_Static::SetIVal("read.iges.bspline.continuity",
-                              theParameter.ReadBSplineContinuity);
-    Interface_Static::SetIVal("read.precision.mode",
-                              theParameter.ReadPrecisionMode);
-    Interface_Static::SetRVal("read.precision.val",
-                              theParameter.ReadPrecisionVal);
-    Interface_Static::SetIVal("read.maxprecision.mode",
-                              theParameter.ReadMaxPrecisionMode);
-    Interface_Static::SetRVal("read.maxprecision.val",
-                              theParameter.ReadMaxPrecisionVal);
-    Interface_Static::SetIVal("read.stdsameparameter.mode",
-                              theParameter.ReadSameParamMode);
-    Interface_Static::SetIVal("read.surfacecurve.mode",
-                              theParameter.ReadSurfaceCurveMode);
-    Interface_Static::SetRVal("read.encoderegularity.angle",
-                              theParameter.EncodeRegAngle * M_PI / 180.0);
-
-    Interface_Static::SetIVal("read.iges.bspline.approxd1.mode",
-                              theParameter.ReadApproxd1);
-    Interface_Static::SetCVal("read.iges.resource.name",
-                              theParameter.ReadResourceName.ToCString());
-    Interface_Static::SetCVal("read.iges.sequence",
-                              theParameter.ReadSequence.ToCString());
-    Interface_Static::SetIVal("read.iges.faulty.entities",
-                              theParameter.ReadFaultyEntities);
-    Interface_Static::SetIVal("read.iges.onlyvisible",
-                              theParameter.ReadOnlyVisible);
-
-    Interface_Static::SetIVal("write.iges.brep.mode",
-                              theParameter.WriteBRepMode);
-    Interface_Static::SetIVal("write.convertsurface.mode",
-                              theParameter.WriteConvertSurfaceMode);
-    Interface_Static::SetIVal("write.iges.unit",
-                              theParameter.WriteUnit);
-    Interface_Static::SetCVal("write.iges.header.author",
-                              theParameter.WriteHeaderAuthor.ToCString());
-    Interface_Static::SetCVal("write.iges.header.company",
-                              theParameter.WriteHeaderCompany.ToCString());
-    Interface_Static::SetCVal("write.iges.header.product",
-                              theParameter.WriteHeaderProduct.ToCString());
-    Interface_Static::SetCVal("write.iges.header.receiver",
-                              theParameter.WriteHeaderReciever.ToCString());
-    Interface_Static::SetCVal("write.iges.resource.name",
-                              theParameter.WriteResourceName.ToCString());
-    Interface_Static::SetCVal("write.iges.sequence",
-                              theParameter.WriteSequence.ToCString());
-    Interface_Static::SetIVal("write.precision.mode",
-                              theParameter.WritePrecisionMode);
-    Interface_Static::SetRVal("write.precision.val",
-                              theParameter.WritePrecisionVal);
-    Interface_Static::SetIVal("write.iges.plane.mode",
-                              theParameter.WritePlaneMode);
-    Interface_Static::SetIVal("write.iges.offset.mode",
-                              theParameter.WriteOffsetMode);
-  }
-}
-
 //=======================================================================
 // function : IGESCAFControl_Provider
 // purpose  :
@@ -240,23 +42,99 @@ IGESCAFControl_Provider::IGESCAFControl_Provider(const Handle(DE_ConfigurationNo
 {}
 
 //=======================================================================
-// function : STEPCAFControl_Provider
+// function : initStatic
 // purpose  :
 //=======================================================================
-void IGESCAFControl_Provider::personizeWS(Handle(XSControl_WorkSession)& theWS)
+void IGESCAFControl_Provider::initStatic(const Handle(DE_ConfigurationNode)& theNode)
 {
-  if (theWS.IsNull())
-  {
-    Message::SendWarning() << "Warning: IGESCAFControl_Provider :"
-      << " Null work session, use internal temporary session";
-    theWS = new XSControl_WorkSession();
-  }
-  Handle(IGESControl_Controller) aCntrl =
-    Handle(IGESControl_Controller)::DownCast(theWS->NormAdaptor());
-  if (aCntrl.IsNull())
-  {
-    theWS->SelectNorm("IGES");
-  }
+  Handle(IGESCAFControl_ConfigurationNode) aNode = Handle(IGESCAFControl_ConfigurationNode)::DownCast(theNode);
+  IGESData::Init();
+
+  // Get previous values
+  myOldValues.ReadBSplineContinuity = (IGESCAFControl_ConfigurationNode::ReadMode_BSplineContinuity)Interface_Static::IVal("read.iges.bspline.continuity");
+  myOldValues.ReadPrecisionMode = (IGESCAFControl_ConfigurationNode::ReadMode_Precision)Interface_Static::IVal("read.precision.mode");
+  myOldValues.ReadPrecisionVal = Interface_Static::RVal("read.precision.val");
+  myOldValues.ReadMaxPrecisionMode = (IGESCAFControl_ConfigurationNode::ReadMode_MaxPrecision)Interface_Static::IVal("read.maxprecision.mode");
+  myOldValues.ReadMaxPrecisionVal = Interface_Static::RVal("read.maxprecision.val");
+  myOldValues.ReadSameParamMode = Interface_Static::IVal("read.stdsameparameter.mode") == 1;
+  myOldValues.ReadSurfaceCurveMode = (IGESCAFControl_ConfigurationNode::ReadMode_SurfaceCurve)Interface_Static::IVal("read.surfacecurve.mode");
+  myOldValues.EncodeRegAngle = Interface_Static::RVal("read.encoderegularity.angle") * 180.0 / M_PI;
+
+  myOldValues.ReadApproxd1 = Interface_Static::IVal("read.iges.bspline.approxd1.mode") == 1;
+  myOldValues.ReadResourceName = Interface_Static::CVal("read.iges.resource.name");
+  myOldValues.ReadSequence = Interface_Static::CVal("read.iges.sequence");
+  myOldValues.ReadFaultyEntities = Interface_Static::IVal("read.iges.faulty.entities") == 1;
+  myOldValues.ReadOnlyVisible = Interface_Static::IVal("read.iges.onlyvisible") == 1;
+
+  myOldValues.WriteBRepMode = (IGESCAFControl_ConfigurationNode::WriteMode_BRep)Interface_Static::IVal("write.iges.brep.mode");
+  myOldValues.WriteConvertSurfaceMode = (IGESCAFControl_ConfigurationNode::WriteMode_ConvertSurface)Interface_Static::IVal("write.convertsurface.mode");
+  myOldValues.WriteUnit = (UnitsMethods_LengthUnit)Interface_Static::IVal("write.iges.unit");
+  myOldValues.WriteHeaderAuthor = Interface_Static::CVal("write.iges.header.author");
+  myOldValues.WriteHeaderCompany = Interface_Static::CVal("write.iges.header.company");
+  myOldValues.WriteHeaderProduct = Interface_Static::CVal("write.iges.header.product");
+  myOldValues.WriteHeaderReciever = Interface_Static::CVal("write.iges.header.receiver");
+  myOldValues.WriteResourceName = Interface_Static::CVal("write.iges.resource.name");
+  myOldValues.WriteSequence = Interface_Static::CVal("write.iges.sequence");
+  myOldValues.WritePrecisionMode = (IGESCAFControl_ConfigurationNode::WriteMode_PrecisionMode)Interface_Static::IVal("write.precision.mode");
+  myOldValues.WritePrecisionVal = Interface_Static::RVal("write.precision.val");
+  myOldValues.WritePlaneMode = (IGESCAFControl_ConfigurationNode::WriteMode_PlaneMode)Interface_Static::IVal("write.iges.plane.mode");
+  myOldValues.WriteOffsetMode = Interface_Static::IVal("write.iges.offset.mode") == 1;
+
+  myOldLengthUnit = Interface_Static::IVal("xstep.cascade.unit");
+
+  // Set new values
+  UnitsMethods::SetCasCadeLengthUnit(aNode->GlobalParameters.LengthUnit, UnitsMethods_LengthUnit_Millimeter);
+  TCollection_AsciiString aStrUnit(UnitsMethods::DumpLengthUnit(aNode->GlobalParameters.LengthUnit));
+  aStrUnit.UpperCase();
+  Interface_Static::SetCVal("xstep.cascade.unit", aStrUnit.ToCString());
+  setStatic(aNode->InternalParameters);
+}
+
+//=======================================================================
+// function : setStatic
+// purpose  :
+//=======================================================================
+void IGESCAFControl_Provider::setStatic(const IGESCAFControl_ConfigurationNode::IGESCAFControl_InternalSection theParameter)
+{
+  Interface_Static::SetIVal("read.iges.bspline.continuity", theParameter.ReadBSplineContinuity);
+  Interface_Static::SetIVal("read.precision.mode", theParameter.ReadPrecisionMode);
+  Interface_Static::SetRVal("read.precision.val", theParameter.ReadPrecisionVal);
+  Interface_Static::SetIVal("read.maxprecision.mode", theParameter.ReadMaxPrecisionMode);
+  Interface_Static::SetRVal("read.maxprecision.val", theParameter.ReadMaxPrecisionVal);
+  Interface_Static::SetIVal("read.stdsameparameter.mode", theParameter.ReadSameParamMode);
+  Interface_Static::SetIVal("read.surfacecurve.mode", theParameter.ReadSurfaceCurveMode);
+  Interface_Static::SetRVal("read.encoderegularity.angle", theParameter.EncodeRegAngle * M_PI / 180.0);
+
+  Interface_Static::SetIVal("read.iges.bspline.approxd1.mode", theParameter.ReadApproxd1);
+  Interface_Static::SetCVal("read.iges.resource.name", theParameter.ReadResourceName.ToCString());
+  Interface_Static::SetCVal("read.iges.sequence", theParameter.ReadSequence.ToCString());
+  Interface_Static::SetIVal("read.iges.faulty.entities", theParameter.ReadFaultyEntities);
+  Interface_Static::SetIVal("read.iges.onlyvisible", theParameter.ReadOnlyVisible);
+
+  Interface_Static::SetIVal("write.iges.brep.mode", theParameter.WriteBRepMode);
+  Interface_Static::SetIVal("write.convertsurface.mode", theParameter.WriteConvertSurfaceMode);
+  Interface_Static::SetIVal("write.iges.unit", theParameter.WriteUnit);
+  Interface_Static::SetCVal("write.iges.header.author", theParameter.WriteHeaderAuthor.ToCString());
+  Interface_Static::SetCVal("write.iges.header.company", theParameter.WriteHeaderCompany.ToCString());
+  Interface_Static::SetCVal("write.iges.header.product", theParameter.WriteHeaderProduct.ToCString());
+  Interface_Static::SetCVal("write.iges.header.receiver", theParameter.WriteHeaderReciever.ToCString());
+  Interface_Static::SetCVal("write.iges.resource.name", theParameter.WriteResourceName.ToCString());
+  Interface_Static::SetCVal("write.iges.sequence", theParameter.WriteSequence.ToCString());
+  Interface_Static::SetIVal("write.precision.mode", theParameter.WritePrecisionMode);
+  Interface_Static::SetRVal("write.precision.val", theParameter.WritePrecisionVal);
+  Interface_Static::SetIVal("write.iges.plane.mode", theParameter.WritePlaneMode);
+  Interface_Static::SetIVal("write.iges.offset.mode", theParameter.WriteOffsetMode);
+}
+
+//=======================================================================
+// function : resetStatic
+// purpose  :
+//=======================================================================
+void IGESCAFControl_Provider::resetStatic()
+{
+  Interface_Static::SetIVal("xstep.cascade.unit", myOldLengthUnit);
+  UnitsMethods::SetCasCadeLengthUnit(myOldLengthUnit);
+  setStatic(myOldValues);
 }
 
 //=======================================================================
@@ -270,70 +148,50 @@ bool IGESCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
 {
   if (theDocument.IsNull())
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "Null document";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: theDocument shouldn't be null";
     return false;
   }
   if (!GetNode()->IsKind(STANDARD_TYPE(IGESCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(IGESCAFControl_ConfigurationNode) aNode =
-    Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
-  IGESCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  XCAFDoc_DocumentTool::SetLengthUnit(theDocument,
-                                      aNode->GlobalParameters.LengthUnit,
-                                      UnitsMethods_LengthUnit_Millimeter);
-  const Standard_Boolean toUseLoaded = thePath == ".";
-  TCollection_AsciiString aFile;
-  if (toUseLoaded)
+  Handle(IGESCAFControl_ConfigurationNode) aNode = Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
+
+  XCAFDoc_DocumentTool::SetLengthUnit(theDocument, aNode->GlobalParameters.LengthUnit, UnitsMethods_LengthUnit_Millimeter);
+  IGESCAFControl_Reader aReader;
+  if (!theWS.IsNull())
   {
-    aFile = theWS->LoadedFile();
-    Message::SendInfo() << "Model taken from the IGES session : "
-      << aFile;
+    aReader.SetWS(theWS);
   }
-  else
-  {
-    aFile = thePath;
-    Message::SendInfo() << "File IGES to read : "
-      << aFile;
-  }
-  IGESCAFControl_Reader aReader(theWS, !toUseLoaded);
+
   aReader.SetReadVisible(aNode->InternalParameters.ReadOnlyVisible);
+
   aReader.SetColorMode(aNode->InternalParameters.ReadColor);
   aReader.SetNameMode(aNode->InternalParameters.ReadName);
   aReader.SetLayerMode(aNode->InternalParameters.ReadLayer);
-  Handle(IGESData_IGESModel) aModel = aReader.IGESModel();
-  if (aModel.IsNull())
-  {
-    aModel = Handle(IGESData_IGESModel)::DownCast(theWS->NewModel());
-  }
-  aModel->ClearHeader();
-  aModel->ChangeGlobalSection().SetCascadeUnit(aNode->GlobalParameters.LengthUnit);
+
   IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid;
-  if (!toUseLoaded)
-  {
-    aReadStat = aReader.ReadFile(thePath.ToCString());
-  }
-  else if (theWS->NbStartingEntities() > 0)
-  {
-    aReadStat = IFSelect_RetDone;
-  }
+  aReadStat = aReader.ReadFile(thePath.ToCString());
   if (aReadStat != IFSelect_RetDone)
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : ["
-      << aFile << "] : abandon, no model loaded";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: abandon, no model loaded";
+    resetStatic();
     return false;
   }
+
   if (!aReader.Transfer(theDocument, theProgress))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : [" <<
-      aFile << "] : Cannot read any relevant data from the IGES file";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Cannot read any relevant data from the IGES file";
+    resetStatic();
     return false;
   }
+  resetStatic();
   return true;
 }
 
@@ -348,35 +206,18 @@ bool IGESCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
 {
   if (!GetNode()->IsKind(STANDARD_TYPE(IGESCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(IGESCAFControl_ConfigurationNode) aNode =
-    Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
-  IGESCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  TCollection_AsciiString aUnit(
-    UnitsMethods::DumpLengthUnit(aNode->InternalParameters.WriteUnit));
-  aUnit.UpperCase();
+  Handle(IGESCAFControl_ConfigurationNode) aNode = Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
 
-  IGESCAFControl_Writer aWriter(theWS, Standard_True);
-  if (aNode->InternalParameters.WriteUnit > UnitsMethods_LengthUnit_Undefined &&
-      aNode->InternalParameters.WriteUnit <= UnitsMethods_LengthUnit_Microinch)
+  XCAFDoc_DocumentTool::SetLengthUnit(theDocument, aNode->InternalParameters.WriteUnit, UnitsMethods_LengthUnit_Millimeter);
+  IGESCAFControl_Writer aWriter;
+  if (!theWS.IsNull())
   {
-    Handle(IGESData_IGESModel) aModel = aWriter.Model();
-    IGESData_GlobalSection aGSesction = aModel->GlobalSection();
-    Handle(TCollection_HAsciiString) aName = new TCollection_HAsciiString(
-      IGESData_BasicEditor::UnitFlagName(aNode->InternalParameters.WriteUnit));
-    if (aGSesction.UnitFlag() == 3)
-    {
-      aGSesction.SetUnitName(aName);
-    }
-    else if (aGSesction.UnitFlag() > 0)
-    {
-      aGSesction.SetUnitFlag(aNode->InternalParameters.WriteUnit);
-    }
-    aModel->SetGlobalSection(aGSesction);
+    aWriter = IGESCAFControl_Writer(theWS);
   }
   aWriter.SetColorMode(aNode->InternalParameters.WriteColor);
   aWriter.SetNameMode(aNode->InternalParameters.WriteName);
@@ -384,25 +225,46 @@ bool IGESCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
 
   if (!aWriter.Transfer(theDocument, theProgress))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "The document cannot be translated or gives no result";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: The document cannot be translated or gives no result";
+    resetStatic();
     return false;
   }
-  if (thePath == ".")
-  {
-    Message::SendInfo() << "Document has been translated into the session";
-    return true;
-  }
   if (!aWriter.Write(thePath.ToCString()))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : [" <<
-      thePath << "] : Write failed";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Write failed";
+    resetStatic();
     return false;
   }
-  Message::SendInfo() << "IGES file [" << thePath << "] Successfully written";
+  resetStatic();
   return true;
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool IGESCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
+                                   const Handle(TDocStd_Document)& theDocument,
+                                   const Message_ProgressRange& theProgress)
+{
+  Handle(XSControl_WorkSession) aWS;
+  return Read(thePath, theDocument, aWS, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool IGESCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress)
+{
+  Handle(XSControl_WorkSession) aWS;
+  return Write(thePath, theDocument, aWS, theProgress);
+}
+
 //=======================================================================
 // function : Read
 // purpose  :
@@ -415,39 +277,36 @@ bool IGESCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
   (void)theProgress;
   if (!GetNode()->IsKind(STANDARD_TYPE(IGESCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(IGESCAFControl_ConfigurationNode) aNode =
-    Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
-  IGESCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
+  Handle(IGESCAFControl_ConfigurationNode) aNode = Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
   IGESControl_Reader aReader;
-  aReader.SetWS(theWS);
-  Handle(IGESData_IGESModel) aModel = aReader.IGESModel();
-  if (aModel.IsNull())
+  if (!theWS.IsNull())
   {
-    aModel = Handle(IGESData_IGESModel)::DownCast(theWS->NewModel());
+    aReader.SetWS(theWS);
   }
-  aModel->ClearHeader();
-  aModel->ChangeGlobalSection().SetCascadeUnit(aNode->GlobalParameters.LengthUnit);
   aReader.SetReadVisible(aNode->InternalParameters.ReadOnlyVisible);
   IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid;
   aReadStat = aReader.ReadFile(thePath.ToCString());
   if (aReadStat != IFSelect_RetDone)
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : [" <<
-      thePath << "] : Could not read file, no model loaded";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Could not read file, no model loaded";
+    resetStatic();
     return false;
   }
   if (aReader.TransferRoots() <= 0)
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : [" <<
-      thePath << "] : Cannot read any relevant data from the IGES file";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Cannot read any relevant data from the IGES file";
+    resetStatic();
     return false;
   }
   theShape = aReader.OneShape();
+  resetStatic();
   return true;
 }
 
@@ -464,36 +323,58 @@ bool IGESCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
   (void)theProgress;
   if (!GetNode()->IsKind(STANDARD_TYPE(IGESCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the IGESCAFControl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(IGESCAFControl_ConfigurationNode) aNode =
-    Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
-  IGESCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  TCollection_AsciiString aUnit(
-    UnitsMethods::DumpLengthUnit(aNode->InternalParameters.WriteUnit));
+  Handle(IGESCAFControl_ConfigurationNode) aNode = Handle(IGESCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
+  TCollection_AsciiString aUnit(UnitsMethods::DumpLengthUnit(aNode->InternalParameters.WriteUnit));
   aUnit.UpperCase();
   IGESControl_Writer aWriter(aUnit.ToCString(),
                              aNode->InternalParameters.WriteBRepMode);
   Standard_Boolean aIsOk = aWriter.AddShape(theShape);
   if (!aIsOk)
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "Can't translate shape to IGES model";
+    Message::SendFail() << "IGESCAFControl_Provider: Shape not written";
+    resetStatic();
     return false;
   }
 
   if (!(aWriter.Write(thePath.ToCString())))
   {
-    Message::SendFail() << "Error: IGESCAFControl_Provider : "
-      << "Can't write IGES file" << thePath;
+    Message::SendFail() << "IGESCAFControl_Provider: Error on writing file " << thePath;
+    resetStatic();
     return false;
   }
+  resetStatic();
   return true;
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool IGESCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
+                                   TopoDS_Shape& theShape,
+                                   const Message_ProgressRange& theProgress)
+{
+  Handle(XSControl_WorkSession) aWS;
+  return Read(thePath, theShape, aWS, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool IGESCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
+                                    const TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress)
+{
+  Handle(XSControl_WorkSession) aWS;
+  return Write(thePath, theShape, aWS, theProgress);
+}
+
 //=======================================================================
 // function : GetFormat
 // purpose  :

src/IGESCAFControl/IGESCAFControl_Provider.hxx

@@ -15,7 +15,6 @@
 #define _IGESCAFControl_Provider_HeaderFile
 
 #include <DE_Provider.hxx>
-#include <DE_ConfigurationNode.hxx>
 #include <IGESCAFControl_ConfigurationNode.hxx>
 
 //! The class to transfer IGES files.
@@ -66,6 +65,23 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const Handle(TDocStd_Document)& theDocument,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
@@ -89,6 +105,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const TopoDS_Shape& theShape,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider
@@ -99,24 +133,19 @@ public:
   //! @return provider's vendor name
   Standard_EXPORT virtual TCollection_AsciiString GetVendor() const Standard_OVERRIDE;
 
-public:
-
-  //! Sets parameter to update static parameter, that true by default
-  void SetToUpdateStaticParameters(const bool theToUpdate) { myToUpdateStaticParameters = theToUpdate; }
-
-  //! Gets parameter to update static parameter, that true by default
-  bool ToUpdateStaticParameters() const  { return myToUpdateStaticParameters; }
-
 private:
 
-  //! Personizes work session with current format.
-  //! Creates new temporary session if current session is null
-  //! @param[in] theWS current work session
-  void personizeWS(Handle(XSControl_WorkSession)& theWS);
+  //! Initialize static variables
+  void initStatic(const Handle(DE_ConfigurationNode)& theNode);
 
-private:
+  //! Initialize static variables
+  void setStatic(const IGESCAFControl_ConfigurationNode::IGESCAFControl_InternalSection theParameter);
 
-  bool myToUpdateStaticParameters = true; //!< Flag to updating static parameters
+  //! Reset used interface static variables
+  void resetStatic();
+
+  IGESCAFControl_ConfigurationNode::IGESCAFControl_InternalSection myOldValues;
+  int myOldLengthUnit = 1;
 
 };
 

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/RWGltf/RWGltf_ConfigurationNode.cxx

@@ -53,43 +53,43 @@ bool RWGltf_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe
 {
   TCollection_AsciiString aScope = THE_CONFIGURATION_SCOPE() + "." + GetFormat() + "." + GetVendor();
 
-  InternalParameters.FileLengthUnit =
+  InternalParameters.FileLengthUnit = 
     theResource->RealVal("file.length.unit", InternalParameters.FileLengthUnit, aScope);
   InternalParameters.SystemCS = (RWMesh_CoordinateSystem)
     (theResource->IntegerVal("system.cs", (int)InternalParameters.SystemCS, aScope) % 2);
   InternalParameters.FileCS = (RWMesh_CoordinateSystem)
     (theResource->IntegerVal("file.cs", (int)InternalParameters.SystemCS, aScope) % 2);
 
-  InternalParameters.ReadSinglePrecision =
+  InternalParameters.ReadSinglePrecision = 
     theResource->BooleanVal("read.single.precision", InternalParameters.ReadSinglePrecision, aScope);
-  InternalParameters.ReadCreateShapes =
+  InternalParameters.ReadCreateShapes = 
     theResource->BooleanVal("read.create.shapes", InternalParameters.ReadCreateShapes, aScope);
-  InternalParameters.ReadRootPrefix =
+  InternalParameters.ReadRootPrefix = 
     theResource->StringVal("read.root.prefix", InternalParameters.ReadRootPrefix, aScope);
-  InternalParameters.ReadFillDoc =
+  InternalParameters.ReadFillDoc = 
     theResource->BooleanVal("read.fill.doc", InternalParameters.ReadFillDoc, aScope);
-  InternalParameters.ReadFillIncomplete =
+  InternalParameters.ReadFillIncomplete = 
     theResource->BooleanVal("read.fill.incomplete", InternalParameters.ReadFillIncomplete, aScope);
-  InternalParameters.ReadMemoryLimitMiB =
+  InternalParameters.ReadMemoryLimitMiB = 
     theResource->IntegerVal("read.memory.limit.mib", InternalParameters.ReadMemoryLimitMiB, aScope);
-  InternalParameters.ReadParallel =
+  InternalParameters.ReadParallel = 
     theResource->BooleanVal("read.parallel", InternalParameters.ReadParallel, aScope);
-  InternalParameters.ReadSkipEmptyNodes =
+  InternalParameters.ReadSkipEmptyNodes = 
     theResource->BooleanVal("read.skip.empty.nodes", InternalParameters.ReadSkipEmptyNodes, aScope);
-  InternalParameters.ReadLoadAllScenes =
+  InternalParameters.ReadLoadAllScenes = 
     theResource->BooleanVal("read.load.all.scenes", InternalParameters.ReadLoadAllScenes, aScope);
-  InternalParameters.ReadUseMeshNameAsFallback =
+  InternalParameters.ReadUseMeshNameAsFallback = 
     theResource->BooleanVal("read.use.mesh.name.as.fallback", InternalParameters.ReadUseMeshNameAsFallback, aScope);
-  InternalParameters.ReadSkipLateDataLoading =
+  InternalParameters.ReadSkipLateDataLoading = 
     theResource->BooleanVal("read.skip.late.data.loading", InternalParameters.ReadSkipLateDataLoading, aScope);
-  InternalParameters.ReadKeepLateData =
+  InternalParameters.ReadKeepLateData = 
     theResource->BooleanVal("read.keep.late.data", InternalParameters.ReadKeepLateData, aScope);
-  InternalParameters.ReadPrintDebugMessages =
+  InternalParameters.ReadPrintDebugMessages = 
     theResource->BooleanVal("read.print.debug.message", InternalParameters.ReadPrintDebugMessages, aScope);
 
-  InternalParameters.WriteComment =
+  InternalParameters.WriteComment = 
     theResource->StringVal("write.comment", InternalParameters.WriteComment, aScope);
-  InternalParameters.WriteAuthor =
+  InternalParameters.WriteAuthor = 
     theResource->StringVal("write.author", InternalParameters.WriteAuthor, aScope);
 
   InternalParameters.WriteTrsfFormat = (RWGltf_WriterTrsfFormat)
@@ -98,43 +98,14 @@ bool RWGltf_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRe
     (theResource->IntegerVal("write.node.name.format", InternalParameters.WriteNodeNameFormat, aScope) % (RWMesh_NameFormat_ProductAndInstanceAndOcaf + 1));
   InternalParameters.WriteMeshNameFormat = (RWMesh_NameFormat)
     (theResource->IntegerVal("write.mesh.name.format", InternalParameters.WriteMeshNameFormat, aScope) % (RWMesh_NameFormat_ProductAndInstanceAndOcaf + 1));
-
-  // Draco parameters
-  InternalParameters.WriteDracoParameters.DracoCompression =
-    theResource->BooleanVal("write.draco.compression",
-                            InternalParameters.WriteDracoParameters.DracoCompression, aScope);
-  InternalParameters.WriteDracoParameters.CompressionLevel =
-    theResource->IntegerVal("write.draco.level",
-                            InternalParameters.WriteDracoParameters.CompressionLevel, aScope);
-  InternalParameters.WriteDracoParameters.QuantizePositionBits =
-    theResource->IntegerVal("write.draco.position.bits",
-                            InternalParameters.WriteDracoParameters.QuantizePositionBits, aScope);
-  InternalParameters.WriteDracoParameters.QuantizeNormalBits =
-    theResource->IntegerVal("write.draco.normal.bits",
-                            InternalParameters.WriteDracoParameters.QuantizeNormalBits, aScope);
-  InternalParameters.WriteDracoParameters.QuantizeTexcoordBits =
-    theResource->IntegerVal("write.draco.texture.bits",
-                            InternalParameters.WriteDracoParameters.QuantizeTexcoordBits, aScope);
-  InternalParameters.WriteDracoParameters.QuantizeColorBits =
-    theResource->IntegerVal("write.draco.color.bits",
-                            InternalParameters.WriteDracoParameters.QuantizeColorBits, aScope);
-  InternalParameters.WriteDracoParameters.QuantizeGenericBits =
-    theResource->IntegerVal("write.draco.generic.bits",
-                            InternalParameters.WriteDracoParameters.QuantizeGenericBits, aScope);
-  InternalParameters.WriteDracoParameters.UnifiedQuantization =
-    theResource->BooleanVal("write.draco.unified.quantization",
-                            InternalParameters.WriteDracoParameters.UnifiedQuantization, aScope);
-
-  InternalParameters.WriteForcedUVExport =
+  InternalParameters.WriteForcedUVExport = 
     theResource->BooleanVal("write.forced.uv.export", InternalParameters.WriteForcedUVExport, aScope);
-  InternalParameters.WriteEmbedTexturesInGlb =
+  InternalParameters.WriteEmbedTexturesInGlb = 
     theResource->BooleanVal("write.embed.textures.in.glb", InternalParameters.WriteEmbedTexturesInGlb, aScope);
-  InternalParameters.WriteMergeFaces =
+  InternalParameters.WriteMergeFaces = 
     theResource->BooleanVal("write.merge.faces", InternalParameters.WriteMergeFaces, aScope);
-  InternalParameters.WriteSplitIndices16 =
+  InternalParameters.WriteSplitIndices16 = 
     theResource->BooleanVal("write.split.indices16", InternalParameters.WriteSplitIndices16, aScope);
-  InternalParameters.WriteParallel =
-    theResource->BooleanVal("write.parallel", InternalParameters.WriteParallel, aScope);
   return true;
 }
 
@@ -287,63 +258,6 @@ TCollection_AsciiString RWGltf_ConfigurationNode::Save() const
   aResult += aScope + "write.mesh.name.format :\t " + InternalParameters.WriteMeshNameFormat + "\n";
   aResult += "!\n";
 
-  // Draco parameters
-  aResult += "!\n";
-  aResult += "!Flag to use Draco compression. If it is TRUE, compression is used\n";
-  aResult += "!Default value: 0(false). Available values: 0(false), 1(true)\n";
-  aResult += aScope + "write.draco.compression :\t " +
-    InternalParameters.WriteDracoParameters.DracoCompression + "\n";
-  aResult += "!\n";
-
-  aResult += "!\n";
-  aResult += "!Draco compression level\n";
-  aResult += "!Default value: 7. Available values: [0-10]\n";
-  aResult += aScope + "write.draco.level :\t " +
-    InternalParameters.WriteDracoParameters.CompressionLevel + "\n";
-  aResult += "!\n";
-
-  aResult += "!\n";
-  aResult += "!Quantization bits for position attribute\n";
-  aResult += "!Default value: 14. Available values: any positive value\n";
-  aResult += aScope + "write.draco.position.bits :\t " +
-    InternalParameters.WriteDracoParameters.QuantizePositionBits + "\n";
-  aResult += "!\n";
-
-  aResult += "!\n";
-  aResult += "!Quantization bits for normal attribute\n";
-  aResult += "!Default value: 10. Available values: any positive value\n";
-  aResult += aScope + "write.draco.normal.bits :\t " +
-    InternalParameters.WriteDracoParameters.QuantizeNormalBits + "\n";
-  aResult += "!\n";
-
-  aResult += "!\n";
-  aResult += "!Quantization bits for texture coordinate attribute\n";
-  aResult += "!Default value: 12. Available values: any positive value\n";
-  aResult += aScope + "write.draco.texture.bits :\t " +
-    InternalParameters.WriteDracoParameters.QuantizeTexcoordBits + "\n";
-  aResult += "!\n";
-
-  aResult += "!\n";
-  aResult += "!Quantization bits for color attributes\n";
-  aResult += "!Default value: 8. Available values: any positive value\n";
-  aResult += aScope + "write.draco.color.bits :\t " +
-    InternalParameters.WriteDracoParameters.QuantizeColorBits + "\n";
-  aResult += "!\n";
-
-  aResult += "!\n";
-  aResult += "!Quantization bits for skinning and custom attributes\n";
-  aResult += "!Default value: 12. Available values: any positive value\n";
-  aResult += aScope + "write.draco.generic.bits :\t " +
-    InternalParameters.WriteDracoParameters.QuantizeGenericBits + "\n";
-  aResult += "!\n";
-
-  aResult += "!\n";
-  aResult += "!Quantize positions of all primitives using the same quantization grid\n";
-  aResult += "!Default value: 0(false). Available values: 0(false), 1(true)\n";
-  aResult += aScope + "write.draco.unified.quantization :\t " +
-    InternalParameters.WriteDracoParameters.UnifiedQuantization + "\n";
-  aResult += "!\n";
-
   aResult += "!\n";
   aResult += "!Export UV coordinates even if there are no mapped texture\n";
   aResult += "!Default value: 0(false). Available values: 0(false), 1(true)\n";
@@ -368,12 +282,6 @@ TCollection_AsciiString RWGltf_ConfigurationNode::Save() const
   aResult += aScope + "write.split.indices16 :\t " + InternalParameters.WriteSplitIndices16 + "\n";
   aResult += "!\n";
 
-  aResult += "!\n";
-  aResult += "!Flag to use multithreading\n";
-  aResult += "!Default value: 0(false). Available values: 0(false), 1(true)\n";
-  aResult += aScope + "write.parallel :\t " + InternalParameters.WriteParallel + "\n";
-  aResult += "!\n";
-
   aResult += "!*****************************************************************************\n";
   return aResult;
 }

src/RWGltf/RWGltf_ConfigurationNode.hxx

@@ -16,7 +16,6 @@
 
 #include <DE_ConfigurationNode.hxx>
 #include <RWMesh_CoordinateSystem.hxx>
-#include <RWGltf_DracoParameters.hxx>
 #include <RWGltf_WriterTrsfFormat.hxx>
 #include <RWMesh_NameFormat.hxx>
 
@@ -108,12 +107,10 @@ public:
     RWGltf_WriterTrsfFormat WriteTrsfFormat = RWGltf_WriterTrsfFormat_Compact; //!< Transformation format to write into glTF file
     RWMesh_NameFormat WriteNodeNameFormat = RWMesh_NameFormat_InstanceOrProduct; //!< Name format for exporting Nodes
     RWMesh_NameFormat WriteMeshNameFormat = RWMesh_NameFormat_Product; //!< Name format for exporting Meshes
-    RWGltf_DracoParameters WriteDracoParameters; //!< Defines draco compression parameters
     bool WriteForcedUVExport = false; //!< Export UV coordinates even if there are no mapped texture
     bool WriteEmbedTexturesInGlb = true; //!< Flag to write image textures into GLB file
     bool WriteMergeFaces = false; //!< Flag to merge faces within a single part
     bool WriteSplitIndices16 = false; //!< Flag to prefer keeping 16-bit indexes while merging face
-    bool WriteParallel = false; //!< Flag to use multithreading
   } InternalParameters;
 };
 

src/RWGltf/RWGltf_Provider.cxx

@@ -20,14 +20,13 @@
 #include <XCAFDoc_ShapeTool.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
 
-namespace
+namespace 
 {
   //=======================================================================
   // function : SetReaderParameters
   // purpose  :
   //=======================================================================
-  static void SetReaderParameters(RWGltf_CafReader& theReader,
-                                  const Handle(RWGltf_ConfigurationNode) theNode)
+  static void SetReaderParameters(RWGltf_CafReader& theReader, const Handle(RWGltf_ConfigurationNode) theNode)
   {
     theReader.SetDoublePrecision(!theNode->InternalParameters.ReadSinglePrecision);
     theReader.SetSystemLengthUnit(theNode->GlobalParameters.LengthUnit / 1000);
@@ -74,36 +73,7 @@ bool RWGltf_Provider::Read(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (theDocument.IsNull())
-  {
-    Message::SendFail() << "Error: RWGltf_Provider : "
-      << "Null document";
-    return false;
-  }
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWGltf_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: RWGltf_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(RWGltf_ConfigurationNode) aNode =
-    Handle(RWGltf_ConfigurationNode)::DownCast(GetNode());
-  RWGltf_CafReader aReader;
-  aReader.SetDocument(theDocument);
-  SetReaderParameters(aReader, aNode);
-  XCAFDoc_DocumentTool::SetLengthUnit(theDocument,
-                                      aNode->GlobalParameters.LengthUnit,
-                                      UnitsMethods_LengthUnit_Millimeter);
-  if (!aReader.Perform(thePath, theProgress))
-  {
-    Message::SendFail() << "Error: RWGltf_Provider : [" <<
-      thePath << "] : Cannot read any relevant data from the GLTF file";
-    return false;
-  }
-  myExternalFiles = aReader.ExternalFiles();
-  myMetadata = aReader.Metadata();
-  return true;
+  return Read(thePath, theDocument, theProgress);
 }
 
 //=======================================================================
@@ -116,15 +86,58 @@ bool RWGltf_Provider::Write(const TCollection_AsciiString& thePath,
                             const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWGltf_ConfigurationNode)))
+  return Write(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool RWGltf_Provider::Read(const TCollection_AsciiString& thePath,
+                           const Handle(TDocStd_Document)& theDocument,
+                           const Message_ProgressRange& theProgress)
+{
+  if (theDocument.IsNull())
   {
-    Message::SendFail() << "Error: RWGltf_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the RWGltf_Provider during reading the file " <<
+      thePath << "\t: theDocument shouldn't be null";
     return false;
   }
-  Handle(RWGltf_ConfigurationNode) aNode =
-    Handle(RWGltf_ConfigurationNode)::DownCast(GetNode());
+  if (GetNode().IsNull() || (!GetNode().IsNull() && !GetNode()->IsKind(STANDARD_TYPE(RWGltf_ConfigurationNode))))
+  {
+    Message::SendFail() << "Error in the RWGltf_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return false;
+  }
+  Handle(RWGltf_ConfigurationNode) aNode = Handle(RWGltf_ConfigurationNode)::DownCast(GetNode());
+  RWGltf_CafReader aReader;
+  aReader.SetDocument(theDocument);
+  SetReaderParameters(aReader, aNode);
+  XCAFDoc_DocumentTool::SetLengthUnit(theDocument, aNode->GlobalParameters.LengthUnit, UnitsMethods_LengthUnit_Millimeter);
+  if (!aReader.Perform(thePath, theProgress))
+  {
+    Message::SendFail() << "Error in the RWGltf_Provider during reading the file " << thePath;
+    return false;
+  }
+  
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWGltf_Provider::Write(const TCollection_AsciiString& thePath,
+                            const Handle(TDocStd_Document)& theDocument,
+                            const Message_ProgressRange& theProgress)
+{
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(RWGltf_ConfigurationNode)))
+  {
+    Message::SendFail() << "Error in the RWGltf_Provider during writing the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return false;
+  }
+  Handle(RWGltf_ConfigurationNode) aNode = Handle(RWGltf_ConfigurationNode)::DownCast(GetNode());
 
   RWMesh_CoordinateSystemConverter aConverter;
   aConverter.SetInputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000);
@@ -146,19 +159,16 @@ bool RWGltf_Provider::Write(const TCollection_AsciiString& thePath,
   anExt.LowerCase();
   RWGltf_CafWriter aWriter(thePath, anExt.EndsWith(".glb"));
   aWriter.SetCoordinateSystemConverter(aConverter);
-  aWriter.SetCompressionParameters(aNode->InternalParameters.WriteDracoParameters);
   aWriter.SetTransformationFormat(aNode->InternalParameters.WriteTrsfFormat);
   aWriter.SetNodeNameFormat(aNode->InternalParameters.WriteNodeNameFormat);
   aWriter.SetMeshNameFormat(aNode->InternalParameters.WriteMeshNameFormat);
   aWriter.SetForcedUVExport(aNode->InternalParameters.WriteForcedUVExport);
   aWriter.SetToEmbedTexturesInGlb(aNode->InternalParameters.WriteEmbedTexturesInGlb);
   aWriter.SetMergeFaces(aNode->InternalParameters.WriteMergeFaces);
-  aWriter.SetParallel(aNode->InternalParameters.WriteParallel);
   aWriter.SetSplitIndices16(aNode->InternalParameters.WriteSplitIndices16);
   if (!aWriter.Perform(theDocument, aFileInfo, theProgress))
   {
-    Message::SendFail() << "Error: RWGltf_Provider : [" <<
-      thePath << "] : Cannot write any relevant data to the GLTF file";
+    Message::SendFail() << "Error in the RWGltf_Provider during writing the file " << thePath;
     return false;
   }
   return true;
@@ -174,27 +184,7 @@ bool RWGltf_Provider::Read(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWGltf_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: RWGltf_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(RWGltf_ConfigurationNode) aNode =
-    Handle(RWGltf_ConfigurationNode)::DownCast(GetNode());
-  RWGltf_CafReader aReader;
-  SetReaderParameters(aReader, aNode);
-  if (!aReader.Perform(thePath, theProgress))
-  {
-    Message::SendFail() << "Error: RWGltf_Provider : [" <<
-      thePath << "] : Cannot read any relevant data from the GLTF file";
-    return false;
-  }
-  theShape = aReader.SingleShape();
-  myExternalFiles = aReader.ExternalFiles();
-  myMetadata = aReader.Metadata();
-  return true;
+  return Read(thePath, theShape, theProgress);
 }
 
 //=======================================================================
@@ -207,10 +197,47 @@ bool RWGltf_Provider::Write(const TCollection_AsciiString& thePath,
                             const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Write(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool RWGltf_Provider::Read(const TCollection_AsciiString& thePath,
+                           TopoDS_Shape& theShape,
+                           const Message_ProgressRange& theProgress)
+{
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(RWGltf_ConfigurationNode)))
+  {
+    Message::SendFail() << "Error in the RWGltf_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return false;
+  }
+  Handle(RWGltf_ConfigurationNode) aNode = Handle(RWGltf_ConfigurationNode)::DownCast(GetNode());
+  RWGltf_CafReader aReader;
+  SetReaderParameters(aReader, aNode);
+  if (!aReader.Perform(thePath, theProgress))
+  {
+    Message::SendFail() << "Error in the RWGltf_Provider during reading the file " << thePath;
+    return false;
+  }
+  theShape = aReader.SingleShape();
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWGltf_Provider::Write(const TCollection_AsciiString& thePath,
+                            const TopoDS_Shape& theShape,
+                            const Message_ProgressRange& theProgress)
+{
   Handle(TDocStd_Document) aDoc = new TDocStd_Document("BinXCAF");
   Handle(XCAFDoc_ShapeTool) aShTool = XCAFDoc_DocumentTool::ShapeTool(aDoc->Main());
   aShTool->AddShape(theShape);
-  return Write(thePath, aDoc, theWS, theProgress);
+  return Write(thePath, aDoc, theProgress);
 }
 
 //=======================================================================

src/RWGltf/RWGltf_Provider.hxx

@@ -66,6 +66,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const Handle(TDocStd_Document)& theDocument,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
   //! @param[out] theShape shape to save result
@@ -88,6 +106,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const TopoDS_Shape& theShape,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider
@@ -98,18 +134,6 @@ public:
   //! @return provider's vendor name
   Standard_EXPORT virtual TCollection_AsciiString GetVendor() const Standard_OVERRIDE;
 
-public:
-
-  //!
-  const TColStd_IndexedDataMapOfStringString& GetMetadata() const { return myMetadata; }
-
-  //!
-  const NCollection_IndexedMap<TCollection_AsciiString>& GetExternalFiles() const { return myExternalFiles; }
-
-private:
-
-  TColStd_IndexedDataMapOfStringString myMetadata; //!<
-  NCollection_IndexedMap<TCollection_AsciiString> myExternalFiles; //!<
 };
 
 #endif // _RWGltf_Provider_HeaderFile

src/RWObj/RWObj_ConfigurationNode.cxx

@@ -63,8 +63,6 @@ bool RWObj_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRes
     theResource->BooleanVal("read.single.precision", InternalParameters.ReadSinglePrecision, aScope);
   InternalParameters.ReadCreateShapes = 
     theResource->BooleanVal("read.create.shapes", InternalParameters.ReadCreateShapes, aScope);
-  InternalParameters.ReadCreateSingle =
-    theResource->BooleanVal("read.create.single", InternalParameters.ReadCreateSingle, aScope);
   InternalParameters.ReadRootPrefix =
     theResource->StringVal("read.root.prefix", InternalParameters.ReadRootPrefix, aScope);
   InternalParameters.ReadFillDoc = 
@@ -125,17 +123,11 @@ TCollection_AsciiString RWObj_ConfigurationNode::Save() const
   aResult += "!\n";
 
   aResult += "!\n";
-  aResult += "!Flag for create shapes in shape reading case\n";
+  aResult += "!Flag for create a single triangulation\n";
   aResult += "!Default value: 0(false). Available values: 0(false), 1(true)\n";
   aResult += aScope + "read.create.shapes :\t " + InternalParameters.ReadCreateShapes + "\n";
   aResult += "!\n";
 
-  aResult += "!\n";
-  aResult += "!Flag for create shapes in shape reading case\n";
-  aResult += "!Default value: 0(false). Available values: 0(false), 1(true)\n";
-  aResult += aScope + "read.create.single :\t " + InternalParameters.ReadCreateSingle + "\n";
-  aResult += "!\n";
-
   aResult += "!\n";
   aResult += "!Root folder for generating root labels names\n";
   aResult += "!Default value: ""(empty). Available values: <path>\n";

src/RWObj/RWObj_ConfigurationNode.hxx

@@ -87,8 +87,7 @@ public:
     RWMesh_CoordinateSystem FileCS = RWMesh_CoordinateSystem_Yup; //!< File origin coordinate system to perform conversion during read
     // Reading
     bool ReadSinglePrecision = false; //!< Flag for reading vertex data with single or double floating point precision
-    bool ReadCreateShapes = false;  //!< Flag for create shapes in shape reading case
-    bool ReadCreateSingle = false;  //!< Flag for create a single triangulation in shape reading case
+    bool ReadCreateShapes = false;  //!< Flag for create a single triangulation
     TCollection_AsciiString ReadRootPrefix; //!< Root folder for generating root labels names
     bool ReadFillDoc = true; //!< Flag for fill document from shape sequence
     bool ReadFillIncomplete = true; //!< Flag for fill the document with partially retrieved data even if reader has failed with error

src/RWObj/RWObj_Provider.cxx

@@ -49,38 +49,7 @@ bool RWObj_Provider::Read(const TCollection_AsciiString& thePath,
                           const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (theDocument.IsNull())
-  {
-    Message::SendFail() << "Error: RWObj_Provider : "
-      << "Null document";
-    return false;
-  }
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWObj_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: RWObj_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(RWObj_ConfigurationNode) aNode =
-    Handle(RWObj_ConfigurationNode)::DownCast(GetNode());
-  RWObj_CafReader aReader;
-  aReader.SetSinglePrecision(aNode->InternalParameters.ReadSinglePrecision);
-  aReader.SetSystemLengthUnit(aNode->GlobalParameters.LengthUnit / 1000);
-  aReader.SetSystemCoordinateSystem(aNode->InternalParameters.SystemCS);
-  aReader.SetFileLengthUnit(aNode->InternalParameters.FileLengthUnit);
-  aReader.SetFileCoordinateSystem(aNode->InternalParameters.FileCS);
-  aReader.SetDocument(theDocument);
-  aReader.SetRootPrefix(aNode->InternalParameters.ReadRootPrefix);
-  aReader.SetMemoryLimitMiB(aNode->InternalParameters.ReadMemoryLimitMiB);
-  if (!aReader.Perform(thePath, theProgress))
-  {
-    Message::SendFail() << "Error: RWObj_Provider : [" <<
-      thePath << "] : Cannot read any relevant data from the Obj file";
-    return false;
-  }
-  myExternalFiles = aReader.ExternalFiles();
-  return true;
+  return Read(thePath, theDocument, theProgress);
 }
 
 //=======================================================================
@@ -93,15 +62,63 @@ bool RWObj_Provider::Write(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWObj_ConfigurationNode)))
+  return Write(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool RWObj_Provider::Read(const TCollection_AsciiString& thePath,
+                          const Handle(TDocStd_Document)& theDocument,
+                          const Message_ProgressRange& theProgress)
+{
+  if (theDocument.IsNull())
   {
-    Message::SendFail() << "Error: RWObj_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the RWObj_Provider during reading the file " <<
+      thePath << "\t: theDocument shouldn't be null";
     return false;
   }
-  Handle(RWObj_ConfigurationNode) aNode =
-    Handle(RWObj_ConfigurationNode)::DownCast(GetNode());
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(RWObj_ConfigurationNode)))
+  {
+    Message::SendFail() << "Error in the RWObj_ConfigurationNode during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return false;
+  }
+  Handle(RWObj_ConfigurationNode) aNode = Handle(RWObj_ConfigurationNode)::DownCast(GetNode());
+  RWObj_CafReader aReader;
+  aReader.SetSinglePrecision(aNode->InternalParameters.ReadSinglePrecision);
+  aReader.SetSystemLengthUnit(aNode->GlobalParameters.LengthUnit / 1000);
+  aReader.SetSystemCoordinateSystem(aNode->InternalParameters.SystemCS);
+  aReader.SetFileLengthUnit(aNode->InternalParameters.FileLengthUnit);
+  aReader.SetFileCoordinateSystem(aNode->InternalParameters.FileCS);
+  aReader.SetDocument(theDocument);
+  aReader.SetRootPrefix(aNode->InternalParameters.ReadRootPrefix);
+  aReader.SetMemoryLimitMiB(aNode->InternalParameters.ReadMemoryLimitMiB);
+  if (!aReader.Perform(thePath, theProgress))
+  {
+    Message::SendFail() << "Error in the RWObj_ConfigurationNode during reading the file " << thePath;
+    return false;
+  }
+  XCAFDoc_DocumentTool::SetLengthUnit(theDocument, aNode->GlobalParameters.LengthUnit, UnitsMethods_LengthUnit_Millimeter);
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWObj_Provider::Write(const TCollection_AsciiString& thePath,
+                           const Handle(TDocStd_Document)& theDocument,
+                           const Message_ProgressRange& theProgress)
+{
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(RWObj_ConfigurationNode)))
+  {
+    Message::SendFail() << "Error in the RWObj_ConfigurationNode during writing the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return false;
+  }
+  Handle(RWObj_ConfigurationNode) aNode = Handle(RWObj_ConfigurationNode)::DownCast(GetNode());
 
   TColStd_IndexedDataMapOfStringString aFileInfo;
   if (!aNode->InternalParameters.WriteAuthor.IsEmpty())
@@ -112,6 +129,7 @@ bool RWObj_Provider::Write(const TCollection_AsciiString& thePath,
   {
     aFileInfo.Add("Comments", aNode->InternalParameters.WriteComment);
   }
+
   RWMesh_CoordinateSystemConverter aConverter;
   aConverter.SetInputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000);
   aConverter.SetInputCoordinateSystem(aNode->InternalParameters.SystemCS);
@@ -122,8 +140,7 @@ bool RWObj_Provider::Write(const TCollection_AsciiString& thePath,
   aWriter.SetCoordinateSystemConverter(aConverter);
   if (!aWriter.Perform(theDocument, aFileInfo, theProgress))
   {
-    Message::SendFail() << "Error: RWObj_Provider : [" <<
-      thePath << "] : Cannot write any relevant data to the Obj file";
+    Message::SendFail() << "Error in the RWObj_ConfigurationNode during writing the file " << thePath;
     return false;
   }
   return true;
@@ -139,61 +156,7 @@ bool RWObj_Provider::Read(const TCollection_AsciiString& thePath,
                           const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWObj_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: RWObj_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(RWObj_ConfigurationNode) aNode =
-    Handle(RWObj_ConfigurationNode)::DownCast(GetNode());
-  if (aNode->InternalParameters.ReadCreateSingle)
-  {
-    RWMesh_CoordinateSystemConverter aConverter;
-    aConverter.SetOutputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000);
-    aConverter.SetOutputCoordinateSystem(aNode->InternalParameters.SystemCS);
-    aConverter.SetInputLengthUnit(aNode->InternalParameters.FileLengthUnit);
-    aConverter.SetInputCoordinateSystem(aNode->InternalParameters.FileCS);
-
-    RWObj_TriangulationReader aSimpleReader;
-    aSimpleReader.SetTransformation(aConverter);
-    aSimpleReader.SetSinglePrecision(aNode->InternalParameters.ReadSinglePrecision);
-    aSimpleReader.SetCreateShapes(aNode->InternalParameters.ReadCreateShapes);
-    aSimpleReader.SetSinglePrecision(aNode->InternalParameters.ReadSinglePrecision);
-    aSimpleReader.SetMemoryLimit(aNode->InternalParameters.ReadMemoryLimitMiB);
-    if (!aSimpleReader.Read(thePath, theProgress))
-    {
-      Message::SendFail() << "Error: RWObj_Provider : [" <<
-        thePath << "] : Cannot read any relevant data from the Obj file";
-      return false;
-    }
-    Handle(Poly_Triangulation) aTriangulation = aSimpleReader.GetTriangulation();
-    TopoDS_Face aFace;
-    BRep_Builder aBuiler;
-    aBuiler.MakeFace(aFace);
-    aBuiler.UpdateFace(aFace, aTriangulation);
-    theShape = aFace;
-    myExternalFiles = aSimpleReader.ExternalFiles();
-    return true;
-  }
-  RWObj_CafReader aReader;
-  aReader.SetSinglePrecision(aNode->InternalParameters.ReadSinglePrecision);
-  aReader.SetSystemLengthUnit(aNode->GlobalParameters.LengthUnit / 1000);
-  aReader.SetSystemCoordinateSystem(aNode->InternalParameters.SystemCS);
-  aReader.SetFileLengthUnit(aNode->InternalParameters.FileLengthUnit);
-  aReader.SetFileCoordinateSystem(aNode->InternalParameters.FileCS);
-  aReader.SetRootPrefix(aNode->InternalParameters.ReadRootPrefix);
-  aReader.SetMemoryLimitMiB(aNode->InternalParameters.ReadMemoryLimitMiB);
-  if (!aReader.Perform(thePath, theProgress))
-  {
-    Message::SendFail() << "Error: RWObj_Provider : [" <<
-      thePath << "] : Cannot read any relevant data from the Obj file";
-    return false;
-  }
-  theShape = aReader.SingleShape();
-  myExternalFiles = aReader.ExternalFiles();
-  return true;
+  return Read(thePath, theShape, theProgress);
 }
 
 //=======================================================================
@@ -206,11 +169,62 @@ bool RWObj_Provider::Write(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Write(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool RWObj_Provider::Read(const TCollection_AsciiString& thePath,
+                          TopoDS_Shape& theShape,
+                          const Message_ProgressRange& theProgress)
+{
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(RWObj_ConfigurationNode)))
+  {
+    Message::SendFail() << "Error in the RWObj_ConfigurationNode during writing the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return false;
+  }
+  Handle(RWObj_ConfigurationNode) aNode = Handle(RWObj_ConfigurationNode)::DownCast(GetNode());
+  RWMesh_CoordinateSystemConverter aConverter;
+  aConverter.SetOutputLengthUnit(aNode->GlobalParameters.LengthUnit / 1000);
+  aConverter.SetOutputCoordinateSystem(aNode->InternalParameters.SystemCS);
+  aConverter.SetInputLengthUnit(aNode->InternalParameters.FileLengthUnit);
+  aConverter.SetInputCoordinateSystem(aNode->InternalParameters.FileCS);
+
+  RWObj_TriangulationReader aSimpleReader;
+  aSimpleReader.SetTransformation(aConverter);
+  aSimpleReader.SetSinglePrecision(aNode->InternalParameters.ReadSinglePrecision);
+  aSimpleReader.SetCreateShapes(aNode->InternalParameters.ReadCreateShapes);
+  aSimpleReader.SetSinglePrecision(aNode->InternalParameters.ReadSinglePrecision);
+  aSimpleReader.SetMemoryLimit(aNode->InternalParameters.ReadMemoryLimitMiB);
+  if (!aSimpleReader.Read(thePath, theProgress))
+  {
+    Message::SendFail() << "Error in the RWObj_ConfigurationNode during reading the file " << thePath;
+    return false;
+  }
+  Handle(Poly_Triangulation) aTriangulation = aSimpleReader.GetTriangulation();
+  TopoDS_Face aFace;
+  BRep_Builder aBuiler;
+  aBuiler.MakeFace(aFace);
+  aBuiler.UpdateFace(aFace, aTriangulation);
+  theShape = aFace;
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWObj_Provider::Write(const TCollection_AsciiString& thePath,
+                           const TopoDS_Shape& theShape,
+                           const Message_ProgressRange& theProgress)
+{
   Handle(TDocStd_Document) aDoc = new TDocStd_Document("BinXCAF");
-  Handle(XCAFDoc_ShapeTool) aShTool =
-    XCAFDoc_DocumentTool::ShapeTool(aDoc->Main());
+  Handle(XCAFDoc_ShapeTool) aShTool = XCAFDoc_DocumentTool::ShapeTool(aDoc->Main());
   aShTool->AddShape(theShape);
-  return Write(thePath, aDoc, theWS, theProgress);
+  return Write(thePath, aDoc, theProgress);
 }
 
 //=======================================================================

src/RWObj/RWObj_Provider.hxx

@@ -16,8 +16,6 @@
 
 #include <DE_Provider.hxx>
 
-#include <NCollection_IndexedMap.hxx>
-
 //! The class to transfer OBJ files.
 //! Reads and Writes any OBJ files into/from OCCT.
 //! Each operation needs configuration node.
@@ -66,6 +64,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const Handle(TDocStd_Document)& theDocument,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
   //! @param[out] theShape shape to save result
@@ -88,6 +104,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const TopoDS_Shape& theShape,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider
@@ -97,15 +131,6 @@ public:
   //! Gets provider's vendor name of associated provider
   //! @return provider's vendor name
   Standard_EXPORT virtual TCollection_AsciiString GetVendor() const Standard_OVERRIDE;
-
-public:
-
-  //!
-  const NCollection_IndexedMap<TCollection_AsciiString>& GetExternalFiles() const { return myExternalFiles; }
-
-private:
-
-  NCollection_IndexedMap<TCollection_AsciiString> myExternalFiles; //!<
 };
 
 #endif // _RWObj_Provider_HeaderFile

src/RWPly/RWPly_Provider.cxx

@@ -52,24 +52,33 @@ bool RWPly_Provider::Write(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWPly_ConfigurationNode)))
+  return Write(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWPly_Provider::Write(const TCollection_AsciiString& thePath,
+                           const Handle(TDocStd_Document)& theDocument,
+                           const Message_ProgressRange& theProgress)
+{
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(RWPly_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: RWPly_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the RWPly_Provider during writing the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(RWPly_ConfigurationNode) aNode =
-    Handle(RWPly_ConfigurationNode)::DownCast(GetNode());
+  Handle(RWPly_ConfigurationNode) aNode = Handle(RWPly_ConfigurationNode)::DownCast(GetNode());
 
   TDF_LabelSequence aRootLabels;
-  Handle(XCAFDoc_ShapeTool) aShapeTool =
-    XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
+  Handle(XCAFDoc_ShapeTool) aShapeTool = XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
   aShapeTool->GetFreeShapes(aRootLabels);
   if (aRootLabels.IsEmpty())
   {
     return Standard_True;
   }
+
   TColStd_IndexedDataMapOfStringString aFileInfo;
   if (!aNode->InternalParameters.WriteAuthor.IsEmpty())
   {
@@ -93,8 +102,8 @@ bool RWPly_Provider::Write(const TCollection_AsciiString& thePath,
   aPlyCtx.SetFaceId(aNode->InternalParameters.WriteFaceId);
   if (!aPlyCtx.Perform(theDocument, aFileInfo, theProgress))
   {
-    Message::SendFail() << "Error: RWObj_Provider : [" <<
-      thePath << "] : Cannot write any relevant data to the Ply file";
+    Message::SendFail() << "Error in the RWPly_Provider during writing the file " 
+      << thePath << "\t: Cannot perform the document";
     return false;
   }
 
@@ -111,10 +120,21 @@ bool RWPly_Provider::Write(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Write(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWPly_Provider::Write(const TCollection_AsciiString& thePath,
+                           const TopoDS_Shape& theShape,
+                           const Message_ProgressRange& theProgress)
+{
   Handle(TDocStd_Document) aDoc = new TDocStd_Document("BinXCAF");
   Handle(XCAFDoc_ShapeTool) aShTool = XCAFDoc_DocumentTool::ShapeTool(aDoc->Main());
   aShTool->AddShape(theShape);
-  return Write(thePath, aDoc, theWS, theProgress);
+  return Write(thePath, aDoc, theProgress);
 }
 
 //=======================================================================

src/RWPly/RWPly_Provider.hxx

@@ -53,6 +53,15 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const Handle(TDocStd_Document)& theDocument,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Writes a CAD file, according internal configuration
   //! @param[in] thePath path to the export CAD file
   //! @param[out] theShape shape to export
@@ -64,6 +73,15 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const TopoDS_Shape& theShape,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider

src/RWStl/RWStl_ConfigurationNode.cxx

@@ -56,8 +56,8 @@ bool RWStl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext)& theRes
 
   InternalParameters.ReadMergeAngle = 
     theResource->RealVal("read.merge.angle", InternalParameters.ReadMergeAngle, aScope);
-  InternalParameters.ReadShapeType = (ReadMode_ShapeType)
-    theResource->IntegerVal("read.brep", InternalParameters.ReadShapeType, aScope);
+  InternalParameters.ReadBRep = 
+    theResource->BooleanVal("read.brep", InternalParameters.ReadBRep, aScope);
   InternalParameters.WriteAscii = 
     theResource->BooleanVal("write.ascii", InternalParameters.WriteAscii, aScope);
   return true;
@@ -85,9 +85,9 @@ TCollection_AsciiString RWStl_ConfigurationNode::Save() const
   aResult += "!\n";
 
   aResult += "!\n";
-  aResult += "!Defines result type of transferred shape\n";
-  aResult += "!Default value: 1(SingleMesh). Available values: 0(MultiMesh), 1(SingleMesh), 2(CompShape)\n";
-  aResult += aScope + "read.brep :\t " + InternalParameters.ReadShapeType + "\n";
+  aResult += "!Setting up Boundary Representation flag\n";
+  aResult += "!Default value: false. Available values: \"on\", \"off\"\n";
+  aResult += aScope + "read.brep :\t " + InternalParameters.ReadBRep + "\n";
   aResult += "!\n";
 
   aResult += "!\n";

src/RWStl/RWStl_ConfigurationNode.hxx

@@ -84,17 +84,11 @@ public:
   Standard_EXPORT virtual bool CheckContent(const Handle(NCollection_Buffer)& theBuffer) const Standard_OVERRIDE;
 
 public:
-  enum ReadMode_ShapeType
-  {
-    ReadMode_ShapeType_MultiMesh = 0,
-    ReadMode_ShapeType_SingleMesh,
-    ReadMode_ShapeType_CompShape,
-  };
   struct RWStl_InternalSection
   {
     // Read
     double ReadMergeAngle = 90.; //!< Input merge angle value
-    ReadMode_ShapeType ReadShapeType = ReadMode_ShapeType_SingleMesh; //!< Defines result type of transferred shape
+    bool ReadBRep = false; //!< Setting up Boundary Representation flag
 
     // Write
     bool WriteAscii = true; //!< Setting up writing mode (Ascii or Binary)

src/RWStl/RWStl_Provider.cxx

@@ -51,21 +51,7 @@ bool RWStl_Provider::Read(const TCollection_AsciiString& thePath,
                           const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  if (theDocument.IsNull())
-  {
-    Message::SendFail() << "Error: RWStl_Provider : "
-      << "Null document";
-    return false;
-  }
-  TopoDS_Shape aShape;
-  if (!Read(thePath, aShape, theWS, theProgress))
-  {
-    return false;
-  }
-  Handle(XCAFDoc_ShapeTool) aShapeTool =
-    XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
-  aShapeTool->AddShape(aShape);
-  return true;
+  return Read(thePath, theDocument, theProgress);
 }
 
 //=======================================================================
@@ -78,15 +64,49 @@ bool RWStl_Provider::Write(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Write(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool RWStl_Provider::Read(const TCollection_AsciiString& thePath,
+                          const Handle(TDocStd_Document)& theDocument,
+                          const Message_ProgressRange& theProgress)
+{
+  if (theDocument.IsNull())
+  {
+    Message::SendFail() << "Error in the RWStl_Provider during reading the file " <<
+      thePath << "\t: theDocument shouldn't be null";
+    return false;
+  }
+  TopoDS_Shape aShape;
+  if (!Read(thePath, aShape, theProgress))
+  {
+    return false;
+  }
+  Handle(XCAFDoc_ShapeTool) aShapeTool = XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
+  aShapeTool->AddShape(aShape);
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWStl_Provider::Write(const TCollection_AsciiString& thePath,
+                           const Handle(TDocStd_Document)& theDocument,
+                           const Message_ProgressRange& theProgress)
+{
   TopoDS_Shape aShape;
   TDF_LabelSequence aLabels;
-  Handle(XCAFDoc_ShapeTool) aSTool =
-    XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
+  Handle(XCAFDoc_ShapeTool) aSTool = XCAFDoc_DocumentTool::ShapeTool(theDocument->Main());
   aSTool->GetFreeShapes(aLabels);
   if (aLabels.Length() <= 0)
   {
-    Message::SendFail() << "Error: RWStl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the RWStl_Provider during writing the file " <<
+      thePath << "\t: Document contain no shapes";
     return false;
   }
 
@@ -106,7 +126,7 @@ bool RWStl_Provider::Write(const TCollection_AsciiString& thePath,
     }
     aShape = aComp;
   }
-  return Write(thePath, aShape, theWS, theProgress);
+  return Write(thePath, aShape, theProgress);
 }
 
 //=======================================================================
@@ -119,87 +139,7 @@ bool RWStl_Provider::Read(const TCollection_AsciiString& thePath,
                           const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  Message::SendWarning()
-    << "OCCT Stl reader does not support model scaling according to custom length unit";
-  if (!GetNode()->IsKind(STANDARD_TYPE(RWStl_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: RWStl_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(RWStl_ConfigurationNode) aNode =
-    Handle(RWStl_ConfigurationNode)::DownCast(GetNode());
-  double aMergeAngle = aNode->InternalParameters.ReadMergeAngle * M_PI / 180.0;
-  if (aMergeAngle < 0.0 || aMergeAngle > M_PI_2)
-  {
-    Message::SendFail() << "Error: RWStl_Provider : ["
-      << aMergeAngle << "] The merge angle is out of the valid range";
-    return false;
-  }
-  switch (aNode->InternalParameters.ReadShapeType)
-  {
-    case(RWStl_ConfigurationNode::ReadMode_ShapeType_MultiMesh):
-    {
-      NCollection_Sequence<Handle(Poly_Triangulation)> aTriangList;
-      // Read STL file to the triangulation list.
-      RWStl::ReadFile(thePath.ToCString(), aMergeAngle, aTriangList, theProgress);
-      BRep_Builder aB;
-      if (aTriangList.Size() == 1)
-      {
-        TopoDS_Face aFace;
-        aB.MakeFace(aFace);
-        aB.UpdateFace(aFace, aTriangList.First());
-        theShape = aFace;
-      }
-      else
-      {
-        TopoDS_Compound aCmp;
-        for (NCollection_Sequence<Handle(Poly_Triangulation)>::Iterator anIt(aTriangList);
-             anIt.More(); anIt.Next())
-        {
-          if (aCmp.IsNull())
-          {
-            aB.MakeCompound(aCmp);
-          }
-          TopoDS_Face aFace;
-          aB.MakeFace(aFace, anIt.Value());
-          aB.Add(aCmp, aFace);
-        }
-        theShape = aCmp;
-      }
-      break;
-    }
-    case(RWStl_ConfigurationNode::ReadMode_ShapeType_SingleMesh):
-    {
-      // Read STL file to the triangulation.
-      Handle(Poly_Triangulation) aTriangulation =
-        RWStl::ReadFile(thePath.ToCString(), aMergeAngle, theProgress);
-
-      if (!aTriangulation.IsNull())
-      {
-        TopoDS_Face aFace;
-        BRep_Builder aB;
-        aB.MakeFace(aFace);
-        aB.UpdateFace(aFace, aTriangulation);
-        theShape = aFace;
-      }
-      break;
-    }
-    case(RWStl_ConfigurationNode::ReadMode_ShapeType_CompShape):
-    {
-      Standard_DISABLE_DEPRECATION_WARNINGS
-        StlAPI::Read(theShape, thePath.ToCString());
-      Standard_ENABLE_DEPRECATION_WARNINGS
-        break;
-    }
-  }
-  if (theShape.IsNull())
-  {
-    Message::SendFail() << "Error: RWStl_Provider : [" <<
-      thePath << "] : Cannot read any relevant data from the STL file";
-    return false;
-  }
-  return true;
+  return Read(thePath, theShape, theProgress);
 }
 
 //=======================================================================
@@ -212,24 +152,81 @@ bool RWStl_Provider::Write(const TCollection_AsciiString& thePath,
                            const Message_ProgressRange& theProgress)
 {
   (void)theWS;
-  Message::SendWarning() <<
-    "OCCT Stl writer does not support model scaling according to custom length unit";
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(RWStl_ConfigurationNode)))
+  return Write(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool RWStl_Provider::Read(const TCollection_AsciiString& thePath,
+                          TopoDS_Shape& theShape,
+                          const Message_ProgressRange& theProgress)
+{
+  Message::SendWarning() << "OCCT Stl reader does not support model scaling according to custom length unit";
+  if (!GetNode()->IsKind(STANDARD_TYPE(RWStl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: RWStl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the RWStl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
+    return true;
+  }
+  Handle(RWStl_ConfigurationNode) aNode = Handle(RWStl_ConfigurationNode)::DownCast(GetNode());
+  double aMergeAngle = aNode->InternalParameters.ReadMergeAngle * M_PI / 180.0;
+  if(aMergeAngle != M_PI_2)
+  {
+    if (aMergeAngle < 0.0 || aMergeAngle > M_PI_2)
+    {
+      Message::SendFail() << "Error in the RWStl_Provider during reading the file " <<
+        thePath << "\t: The merge angle is out of the valid range";
+      return false;
+    }
+  }
+  if (!aNode->InternalParameters.ReadBRep)
+  {
+    Handle(Poly_Triangulation) aTriangulation = RWStl::ReadFile(thePath.ToCString(), aMergeAngle, theProgress);
+
+    TopoDS_Face aFace;
+    BRep_Builder aB;
+    aB.MakeFace(aFace);
+    aB.UpdateFace(aFace, aTriangulation);
+    theShape = aFace;
+  }
+  else
+  {
+    Standard_DISABLE_DEPRECATION_WARNINGS
+      if (!StlAPI::Read(theShape, thePath.ToCString()))
+      {
+        Message::SendFail() << "Error in the RWStl_Provider during reading the file " << thePath;
+        return false;
+      }
+    Standard_ENABLE_DEPRECATION_WARNINGS
+  }
+  return true;
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool RWStl_Provider::Write(const TCollection_AsciiString& thePath,
+                           const TopoDS_Shape& theShape,
+                           const Message_ProgressRange& theProgress)
+{
+  Message::SendWarning() << "OCCT Stl writer does not support model scaling according to custom length unit";
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(RWStl_ConfigurationNode)))
+  {
+    Message::SendFail() << "Error in the RWStl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(RWStl_ConfigurationNode) aNode =
-    Handle(RWStl_ConfigurationNode)::DownCast(GetNode());
+  Handle(RWStl_ConfigurationNode) aNode = Handle(RWStl_ConfigurationNode)::DownCast(GetNode());
 
   StlAPI_Writer aWriter;
   aWriter.ASCIIMode() = aNode->InternalParameters.WriteAscii;
   if (!aWriter.Write(theShape, thePath.ToCString(), theProgress))
   {
-    Message::SendFail() << "Error: RWStl_Provider : [" <<
-      thePath << "] : Mesh writing has been failed";
+    Message::SendFail() << "Error in the RWStl_Provider during reading the file " <<
+      thePath << "\t: Mesh writing has been failed";
     return false;
   }
   return true;

src/RWStl/RWStl_Provider.hxx

@@ -64,6 +64,24 @@ public:
                                                  Handle(XSControl_WorkSession)& theWS,
                                                  const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                                const Handle(TDocStd_Document)& theDocument,
+                                                const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                                 const Handle(TDocStd_Document)& theDocument,
+                                                 const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
   //! @param[out] theShape shape to save result
@@ -86,6 +104,24 @@ public:
                                                  Handle(XSControl_WorkSession)& theWS,
                                                  const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual Standard_Boolean Read(const TCollection_AsciiString& thePath,
+                                                TopoDS_Shape& theShape,
+                                                const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual Standard_Boolean Write(const TCollection_AsciiString& thePath,
+                                                 const TopoDS_Shape& theShape,
+                                                 const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider

src/STEPCAFControl/STEPCAFControl_ConfigurationNode.cxx

@@ -131,12 +131,8 @@ bool STEPCAFControl_ConfigurationNode::Load(const Handle(DE_ConfigurationContext
     theResource->IntegerVal("write.unit", InternalParameters.WriteUnit, aScope);
   InternalParameters.WriteResourceName =
     theResource->StringVal("write.resource.name", InternalParameters.WriteResourceName, aScope);
-  InternalParameters.WriteMultiPrefix =
-    theResource->StringVal("write.multi.prefix", InternalParameters.WriteMultiPrefix, aScope);
   InternalParameters.WriteSequence =
     theResource->StringVal("write.sequence", InternalParameters.WriteSequence, aScope);
-  InternalParameters.WriteLabels =
-    theResource->StringSeqVal("write.labels", InternalParameters.WriteLabels, aScope);
   InternalParameters.WriteVertexMode = (WriteMode_VertexMode)
     theResource->IntegerVal("write.vertex.mode", InternalParameters.WriteVertexMode, aScope);
   InternalParameters.WriteSubshapeNames =
@@ -431,30 +427,12 @@ TCollection_AsciiString STEPCAFControl_ConfigurationNode::Save() const
   aResult += aScope + "write.resource.name :\t " + InternalParameters.WriteResourceName + "\n";
   aResult += "!\n";
 
-  aResult += "!\n";
-  aResult += "!Defines prefix for names of external files, if empty do not make multifile\n";
-  aResult += "!Default value: empty. Available values: <string>\n";
-  aResult += aScope + "write.multi.prefix :\t " + InternalParameters.WriteMultiPrefix + "\n";
-  aResult += "!\n";
-
   aResult += "!\n";
   aResult += "!Defines name of the sequence of operators\n";
   aResult += "!Default value: \"ToSTEP\". Available values: <string>\n";
   aResult += aScope + "write.sequence :\t " + InternalParameters.WriteSequence + "\n";
   aResult += "!\n";
 
-  aResult += "!\n";
-  aResult += "!Defines list of shape labels to export, if empty import full document\n";
-  aResult += "!Default value: empty. Available values: sequense of label entries\n";
-  aResult += aScope + "write.labels :\t ";
-  for (TColStd_ListOfAsciiString::Iterator anIter(InternalParameters.WriteLabels);
-       anIter.More(); anIter.Next())
-  {
-    aResult += anIter.Value();
-    aResult += " ";
-  }
-  aResult += "\n!\n";
-
   aResult += "!\n";
   aResult += "!This parameter indicates which of free vertices writing mode is switch on\n";
   aResult += "!Default value: 0(\"One Compound\"). Available values: 0(\"One Compound\"), 1(\"Signle Vertex\")\n";
@@ -539,15 +517,6 @@ bool STEPCAFControl_ConfigurationNode::IsExportSupported() const
   return true;
 }
 
-//=======================================================================
-// function : IsExportSupported
-// purpose  :
-//=======================================================================
-bool STEPCAFControl_ConfigurationNode::IsStreamSupported() const
-{
-  return true;
-}
-
 //=======================================================================
 // function : GetFormat
 // purpose  :

src/STEPCAFControl/STEPCAFControl_ConfigurationNode.hxx

@@ -17,7 +17,6 @@
 #include <DE_ConfigurationNode.hxx>
 #include <STEPControl_StepModelType.hxx>
 #include <Resource_FormatType.hxx>
-#include <TColStd_SequenceOfAsciiString.hxx>
 #include <UnitsMethods_LengthUnit.hxx>
 
 //! The purpose of this class is to configure the transfer process for STEP format
@@ -70,10 +69,6 @@ public:
   //! @return true if export is supported
   Standard_EXPORT virtual bool IsExportSupported() const Standard_OVERRIDE;
 
-  //! Checks the stream for import/export supporting
-  //! @return Standard_True if stream is support
-  Standard_EXPORT virtual bool IsStreamSupported() const Standard_OVERRIDE;
-
   //! Gets CAD format name of associated provider
   //! @return provider CAD format
   Standard_EXPORT virtual TCollection_AsciiString GetFormat() const Standard_OVERRIDE;
@@ -223,9 +218,7 @@ public:
     bool WriteSurfaceCurMode = true; //<! Indicates whether parametric curves (curves in parametric space of surface) should be written into the STEP file
     UnitsMethods_LengthUnit WriteUnit = UnitsMethods_LengthUnit_Millimeter; //<! Defines a unit in which the STEP file should be written
     TCollection_AsciiString WriteResourceName = "STEP"; //<! Defines the name of the resource file to write
-    TCollection_AsciiString WriteMultiPrefix; //<! Defines prefix for names of external files, if empty do not make multifile
     TCollection_AsciiString WriteSequence = "ToSTEP"; //<! Defines the name of the sequence of operators to write
-    TColStd_ListOfAsciiString WriteLabels; //<! Defines list of shape labels to export, if empty import full document
     WriteMode_VertexMode WriteVertexMode = WriteMode_VertexMode_OneCompound; //<! Indicates which of free vertices writing mode is switch on
     bool WriteSubshapeNames = false; //<! Indicates whether to write sub-shape names to 'Name' attributes of STEP Representation Items
     bool WriteColor = true; //<! ColorMode is used to indicate write Colors or not

src/STEPCAFControl/STEPCAFControl_Provider.cxx

@@ -13,256 +13,19 @@
 
 #include <STEPCAFControl_Provider.hxx>
 
+#include <BinXCAFDrivers.hxx>
 #include <Interface_Static.hxx>
 #include <Message.hxx>
+#include <StepData_StepModel.hxx>
 #include <STEPCAFControl_ConfigurationNode.hxx>
 #include <STEPCAFControl_Controller.hxx>
 #include <STEPCAFControl_Reader.hxx>
 #include <STEPCAFControl_Writer.hxx>
-#include <STEPControl_ActorWrite.hxx>
-#include <STEPControl_Controller.hxx>
-#include <StepData_StepModel.hxx>
-#include <TDataStd_Name.hxx>
-#include <TDF_Tool.hxx>
-#include <TDocStd_Document.hxx>
-#include <UnitsMethods.hxx>
 #include <XCAFDoc_DocumentTool.hxx>
-#include <XSControl_WorkSession.hxx>
+#include <UnitsMethods.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(STEPCAFControl_Provider, DE_Provider)
 
-namespace
-{
-  //! Special class to handle static parameters.
-  //! Initialize all parameters in the begin of life
-  //! and reset changed parameters in the end of life
-  class STEPCAFControl_ParameterController
-  {
-  public:
-
-    STEPCAFControl_ParameterController(const Handle(STEPCAFControl_ConfigurationNode)& theNode,
-                                       const Standard_Boolean theUpdateStatic);
-
-    ~STEPCAFControl_ParameterController();
-
-  protected:
-
-    void setStatic(const STEPCAFControl_ConfigurationNode::STEPCAFControl_InternalSection theParameter);
-
-  private:
-
-    bool myToUpdateStaticParameters; //!< Flag to updating static parameters
-    STEPCAFControl_ConfigurationNode::STEPCAFControl_InternalSection myOldValues; //!< Container to save previous static parameters
-  };
-
-  //=======================================================================
-  // function : STEPCAFControl_ParameterController
-  // purpose  :
-  //=======================================================================
-  STEPCAFControl_ParameterController::STEPCAFControl_ParameterController(const Handle(STEPCAFControl_ConfigurationNode)& theNode,
-                                                                         const Standard_Boolean theUpdateStatic)
-    : myToUpdateStaticParameters(theUpdateStatic)
-  {
-    STEPCAFControl_Controller::Init();
-    STEPControl_Controller::Init();
-    if (!myToUpdateStaticParameters)
-    {
-      return;
-    }
-    // Get previous values
-    myOldValues.ReadBSplineContinuity =
-      (STEPCAFControl_ConfigurationNode::ReadMode_BSplineContinuity)
-      Interface_Static::IVal("read.iges.bspline.continuity");
-    myOldValues.ReadPrecisionMode =
-      (STEPCAFControl_ConfigurationNode::ReadMode_Precision)
-      Interface_Static::IVal("read.precision.mode");
-    myOldValues.ReadPrecisionVal =
-      Interface_Static::RVal("read.precision.val");
-    myOldValues.ReadMaxPrecisionMode =
-      (STEPCAFControl_ConfigurationNode::ReadMode_MaxPrecision)
-      Interface_Static::IVal("read.maxprecision.mode");
-    myOldValues.ReadMaxPrecisionVal =
-      Interface_Static::RVal("read.maxprecision.val");
-    myOldValues.ReadSameParamMode =
-      Interface_Static::IVal("read.stdsameparameter.mode") == 1;
-    myOldValues.ReadSurfaceCurveMode =
-      (STEPCAFControl_ConfigurationNode::ReadMode_SurfaceCurve)
-      Interface_Static::IVal("read.surfacecurve.mode");
-    myOldValues.EncodeRegAngle =
-      Interface_Static::RVal("read.encoderegularity.angle") * 180.0 / M_PI;
-    myOldValues.AngleUnit =
-      (STEPCAFControl_ConfigurationNode::AngleUnitMode)
-      Interface_Static::IVal("step.angleunit.mode");
-
-    myOldValues.ReadResourceName =
-      Interface_Static::CVal("read.step.resource.name");
-    myOldValues.ReadSequence =
-      Interface_Static::CVal("read.step.sequence");
-    myOldValues.ReadProductMode =
-      Interface_Static::IVal("read.step.product.mode") == 1;
-    myOldValues.ReadProductContext =
-      (STEPCAFControl_ConfigurationNode::ReadMode_ProductContext)
-      Interface_Static::IVal("read.step.product.context");
-    myOldValues.ReadShapeRepr =
-      (STEPCAFControl_ConfigurationNode::ReadMode_ShapeRepr)
-      Interface_Static::IVal("read.step.shape.repr");
-    myOldValues.ReadTessellated =
-      (STEPCAFControl_ConfigurationNode::RWMode_Tessellated)
-      Interface_Static::IVal("read.step.tessellated");
-    myOldValues.ReadAssemblyLevel =
-      (STEPCAFControl_ConfigurationNode::ReadMode_AssemblyLevel)
-      Interface_Static::IVal("read.step.assembly.level");
-    myOldValues.ReadRelationship =
-      Interface_Static::IVal("read.step.shape.relationship") == 1;
-    myOldValues.ReadShapeAspect =
-      Interface_Static::IVal("read.step.shape.aspect") == 1;
-    myOldValues.ReadConstrRelation =
-      Interface_Static::IVal("read.step.constructivegeom.relationship") == 1;
-    myOldValues.ReadSubshapeNames =
-      Interface_Static::IVal("read.stepcaf.subshapes.name") == 1;
-    myOldValues.ReadCodePage =
-      (Resource_FormatType)Interface_Static::IVal("read.step.codepage");
-    myOldValues.ReadNonmanifold =
-      Interface_Static::IVal("read.step.nonmanifold") == 1;
-    myOldValues.ReadIdeas =
-      Interface_Static::IVal("read.step.ideas") == 1;
-    myOldValues.ReadAllShapes =
-      Interface_Static::IVal("read.step.all.shapes") == 1;
-    myOldValues.ReadRootTransformation =
-      Interface_Static::IVal("read.step.root.transformation") == 1;
-
-    myOldValues.WritePrecisionMode =
-      (STEPCAFControl_ConfigurationNode::WriteMode_PrecisionMode)
-      Interface_Static::IVal("write.precision.mode");
-    myOldValues.WritePrecisionVal =
-      Interface_Static::RVal("write.precision.val");
-    myOldValues.WriteAssembly =
-      (STEPCAFControl_ConfigurationNode::WriteMode_Assembly)
-      Interface_Static::IVal("write.step.assembly");
-    myOldValues.WriteSchema =
-      (STEPCAFControl_ConfigurationNode::WriteMode_StepSchema)
-      Interface_Static::IVal("write.step.schema");
-    myOldValues.WriteTessellated =
-      (STEPCAFControl_ConfigurationNode::RWMode_Tessellated)
-      Interface_Static::IVal("write.step.tessellated");
-    myOldValues.WriteProductName =
-      Interface_Static::CVal("write.step.product.name");
-    myOldValues.WriteSurfaceCurMode =
-      Interface_Static::IVal("write.surfacecurve.mode") == 1;
-    myOldValues.WriteUnit =
-      (UnitsMethods_LengthUnit)Interface_Static::IVal("write.step.unit");
-    myOldValues.WriteResourceName =
-      Interface_Static::CVal("write.resource.name");
-    myOldValues.WriteSequence =
-      Interface_Static::CVal("write.step.sequence");
-    myOldValues.WriteVertexMode =
-      (STEPCAFControl_ConfigurationNode::WriteMode_VertexMode)
-      Interface_Static::IVal("write.step.vertex.mode");
-    myOldValues.WriteSubshapeNames =
-      Interface_Static::IVal("write.stepcaf.subshapes.name") == 1;
-
-    // Set new values
-    setStatic(theNode->InternalParameters);
-  }
-
-  //=======================================================================
-  // function : ~STEPCAFControl_ParameterController
-  // purpose  :
-  //=======================================================================
-  STEPCAFControl_ParameterController::~STEPCAFControl_ParameterController()
-  {
-    if (!myToUpdateStaticParameters)
-    {
-      return;
-    }
-    setStatic(myOldValues);
-  }
-
-  //=======================================================================
-  // function : setStatic
-  // purpose  :
-  //=======================================================================
-  void STEPCAFControl_ParameterController::setStatic(const STEPCAFControl_ConfigurationNode::STEPCAFControl_InternalSection theParameter)
-  {
-    Interface_Static::SetIVal("read.iges.bspline.continuity",
-                              theParameter.ReadBSplineContinuity);
-    Interface_Static::SetIVal("read.precision.mode",
-                              theParameter.ReadPrecisionMode);
-    Interface_Static::SetRVal("read.precision.val",
-                              theParameter.ReadPrecisionVal);
-    Interface_Static::SetIVal("read.maxprecision.mode",
-                              theParameter.ReadMaxPrecisionMode);
-    Interface_Static::SetRVal("read.maxprecision.val",
-                              theParameter.ReadMaxPrecisionVal);
-    Interface_Static::SetIVal("read.stdsameparameter.mode",
-                              theParameter.ReadSameParamMode);
-    Interface_Static::SetIVal("read.surfacecurve.mode",
-                              theParameter.ReadSurfaceCurveMode);
-    Interface_Static::SetRVal("read.encoderegularity.angle",
-                              theParameter.EncodeRegAngle * M_PI / 180.0);
-    Interface_Static::SetIVal("step.angleunit.mode",
-                              theParameter.AngleUnit);
-
-    Interface_Static::SetCVal("read.step.resource.name",
-                              theParameter.ReadResourceName.ToCString());
-    Interface_Static::SetCVal("read.step.sequence",
-                              theParameter.ReadSequence.ToCString());
-    Interface_Static::SetIVal("read.step.product.mode",
-                              theParameter.ReadProductMode);
-    Interface_Static::SetIVal("read.step.product.context",
-                              theParameter.ReadProductContext);
-    Interface_Static::SetIVal("read.step.shape.repr",
-                              theParameter.ReadShapeRepr);
-    Interface_Static::SetIVal("read.step.tessellated",
-                              theParameter.ReadTessellated);
-    Interface_Static::SetIVal("read.step.assembly.level",
-                              theParameter.ReadAssemblyLevel);
-    Interface_Static::SetIVal("read.step.shape.relationship",
-                              theParameter.ReadRelationship);
-    Interface_Static::SetIVal("read.step.shape.aspect",
-                              theParameter.ReadShapeAspect);
-    Interface_Static::SetIVal("read.step.constructivegeom.relationship",
-                              theParameter.ReadConstrRelation);
-    Interface_Static::SetIVal("read.stepcaf.subshapes.name",
-                              theParameter.ReadSubshapeNames);
-    Interface_Static::SetIVal("read.step.codepage",
-                              theParameter.ReadCodePage);
-    Interface_Static::SetIVal("read.step.nonmanifold",
-                              theParameter.ReadNonmanifold);
-    Interface_Static::SetIVal("read.step.ideas",
-                              theParameter.ReadIdeas);
-    Interface_Static::SetIVal("read.step.all.shapes",
-                              theParameter.ReadAllShapes);
-    Interface_Static::SetIVal("read.step.root.transformation",
-                              theParameter.ReadRootTransformation);
-
-    Interface_Static::SetIVal("write.precision.mode",
-                              theParameter.WritePrecisionMode);
-    Interface_Static::SetRVal("write.precision.val",
-                              theParameter.WritePrecisionVal);
-    Interface_Static::SetIVal("write.step.assembly",
-                              theParameter.WriteAssembly);
-    Interface_Static::SetIVal("write.step.schema",
-                              theParameter.WriteSchema);
-    Interface_Static::SetIVal("write.step.tessellated",
-                              theParameter.WriteTessellated);
-    Interface_Static::SetCVal("write.step.product.name",
-                              theParameter.WriteProductName.ToCString());
-    Interface_Static::SetIVal("write.surfacecurve.mode",
-                              theParameter.WriteSurfaceCurMode);
-    Interface_Static::SetIVal("write.step.unit",
-                              theParameter.WriteUnit);
-    Interface_Static::SetCVal("write.resource.name",
-                              theParameter.WriteResourceName.ToCString());
-    Interface_Static::SetCVal("write.step.sequence",
-                              theParameter.WriteSequence.ToCString());
-    Interface_Static::SetIVal("write.step.vertex.mode",
-                              theParameter.WriteVertexMode);
-    Interface_Static::SetIVal("write.stepcaf.subshapes.name",
-                              theParameter.WriteSubshapeNames);
-  }
-}
-
 //=======================================================================
 // function : STEPCAFControl_Provider
 // purpose  :
@@ -279,23 +42,113 @@ STEPCAFControl_Provider::STEPCAFControl_Provider(const Handle(DE_ConfigurationNo
 {}
 
 //=======================================================================
-// function : personizeWS
+// function : initStatic
 // purpose  :
 //=======================================================================
-void STEPCAFControl_Provider::personizeWS(Handle(XSControl_WorkSession)& theWS)
+void STEPCAFControl_Provider::initStatic(const Handle(DE_ConfigurationNode)& theNode)
 {
-  if (theWS.IsNull())
-  {
-    Message::SendWarning() << "Warning: STEPCAFControl_Provider :"
-      << " Null work session, use internal temporary session";
-    theWS = new XSControl_WorkSession();
-  }
-  Handle(STEPControl_Controller) aCntrl =
-    Handle(STEPControl_Controller)::DownCast(theWS->NormAdaptor());
-  if (aCntrl.IsNull())
-  {
-    theWS->SelectNorm("STEP");
-  }
+  Handle(STEPCAFControl_ConfigurationNode) aNode = Handle(STEPCAFControl_ConfigurationNode)::DownCast(theNode);
+  STEPCAFControl_Controller::Init();
+
+  // Get previous values
+  myOldValues.ReadBSplineContinuity = (STEPCAFControl_ConfigurationNode::ReadMode_BSplineContinuity)Interface_Static::IVal("read.iges.bspline.continuity");
+  myOldValues.ReadPrecisionMode = (STEPCAFControl_ConfigurationNode::ReadMode_Precision)Interface_Static::IVal("read.precision.mode");
+  myOldValues.ReadPrecisionVal = Interface_Static::RVal("read.precision.val");
+  myOldValues.ReadMaxPrecisionMode = (STEPCAFControl_ConfigurationNode::ReadMode_MaxPrecision)Interface_Static::IVal("read.maxprecision.mode");
+  myOldValues.ReadMaxPrecisionVal = Interface_Static::RVal("read.maxprecision.val");
+  myOldValues.ReadSameParamMode = Interface_Static::IVal("read.stdsameparameter.mode") == 1;
+  myOldValues.ReadSurfaceCurveMode = (STEPCAFControl_ConfigurationNode::ReadMode_SurfaceCurve)Interface_Static::IVal("read.surfacecurve.mode");
+  myOldValues.EncodeRegAngle = Interface_Static::RVal("read.encoderegularity.angle") * 180.0 / M_PI;
+  myOldValues.AngleUnit = (STEPCAFControl_ConfigurationNode::AngleUnitMode)Interface_Static::IVal("step.angleunit.mode");
+
+  myOldValues.ReadResourceName = Interface_Static::CVal("read.step.resource.name");
+  myOldValues.ReadSequence = Interface_Static::CVal("read.step.sequence");
+  myOldValues.ReadProductMode = Interface_Static::IVal("read.step.product.mode") == 1;
+  myOldValues.ReadProductContext = (STEPCAFControl_ConfigurationNode::ReadMode_ProductContext)Interface_Static::IVal("read.step.product.context");
+  myOldValues.ReadShapeRepr = (STEPCAFControl_ConfigurationNode::ReadMode_ShapeRepr)Interface_Static::IVal("read.step.shape.repr");
+  myOldValues.ReadTessellated = (STEPCAFControl_ConfigurationNode::RWMode_Tessellated)Interface_Static::IVal("read.step.tessellated");
+  myOldValues.ReadAssemblyLevel = (STEPCAFControl_ConfigurationNode::ReadMode_AssemblyLevel)Interface_Static::IVal("read.step.assembly.level");
+  myOldValues.ReadRelationship = Interface_Static::IVal("read.step.shape.relationship") == 1;
+  myOldValues.ReadShapeAspect = Interface_Static::IVal("read.step.shape.aspect") == 1;
+  myOldValues.ReadConstrRelation = Interface_Static::IVal("read.step.constructivegeom.relationship") == 1;
+  myOldValues.ReadSubshapeNames = Interface_Static::IVal("read.stepcaf.subshapes.name") == 1;
+  myOldValues.ReadCodePage = (Resource_FormatType)Interface_Static::IVal("read.step.codepage");
+  myOldValues.ReadNonmanifold = Interface_Static::IVal("read.step.nonmanifold") == 1;
+  myOldValues.ReadIdeas = Interface_Static::IVal("read.step.ideas") == 1;
+  myOldValues.ReadAllShapes = Interface_Static::IVal("read.step.all.shapes") == 1;
+  myOldValues.ReadRootTransformation = Interface_Static::IVal("read.step.root.transformation") == 1;
+
+  myOldValues.WritePrecisionMode = (STEPCAFControl_ConfigurationNode::WriteMode_PrecisionMode)Interface_Static::IVal("write.precision.mode");
+  myOldValues.WritePrecisionVal = Interface_Static::RVal("write.precision.val");
+  myOldValues.WriteAssembly = (STEPCAFControl_ConfigurationNode::WriteMode_Assembly)Interface_Static::IVal("write.step.assembly");
+  myOldValues.WriteSchema = (STEPCAFControl_ConfigurationNode::WriteMode_StepSchema)Interface_Static::IVal("write.step.schema");
+  myOldValues.WriteTessellated = (STEPCAFControl_ConfigurationNode::RWMode_Tessellated)Interface_Static::IVal("write.step.tessellated");
+  myOldValues.WriteProductName = Interface_Static::CVal("write.step.product.name");
+  myOldValues.WriteSurfaceCurMode = Interface_Static::IVal("write.surfacecurve.mode") == 1;
+  myOldValues.WriteUnit = (UnitsMethods_LengthUnit)Interface_Static::IVal("write.step.unit");
+  myOldValues.WriteResourceName = Interface_Static::CVal("write.resource.name");
+  myOldValues.WriteSequence = Interface_Static::CVal("write.step.sequence");
+  myOldValues.WriteVertexMode = (STEPCAFControl_ConfigurationNode::WriteMode_VertexMode)Interface_Static::IVal("write.step.vertex.mode");
+  myOldValues.WriteSubshapeNames = Interface_Static::IVal("write.stepcaf.subshapes.name") == 1;
+
+  // Set new values
+  setStatic(aNode->InternalParameters);
+}
+
+//=======================================================================
+// function : setStatic
+// purpose  :
+//=======================================================================
+void STEPCAFControl_Provider::setStatic(const STEPCAFControl_ConfigurationNode::STEPCAFControl_InternalSection theParameter)
+{
+  Interface_Static::SetIVal("read.iges.bspline.continuity", theParameter.ReadBSplineContinuity);
+  Interface_Static::SetIVal("read.precision.mode", theParameter.ReadPrecisionMode);
+  Interface_Static::SetRVal("read.precision.val", theParameter.ReadPrecisionVal);
+  Interface_Static::SetIVal("read.maxprecision.mode", theParameter.ReadMaxPrecisionMode);
+  Interface_Static::SetRVal("read.maxprecision.val", theParameter.ReadMaxPrecisionVal);
+  Interface_Static::SetIVal("read.stdsameparameter.mode", theParameter.ReadSameParamMode);
+  Interface_Static::SetIVal("read.surfacecurve.mode", theParameter.ReadSurfaceCurveMode);
+  Interface_Static::SetRVal("read.encoderegularity.angle", theParameter.EncodeRegAngle * M_PI / 180.0);
+  Interface_Static::SetIVal("step.angleunit.mode", theParameter.AngleUnit);
+
+  Interface_Static::SetCVal("read.step.resource.name", theParameter.ReadResourceName.ToCString());
+  Interface_Static::SetCVal("read.step.sequence", theParameter.ReadSequence.ToCString());
+  Interface_Static::SetIVal("read.step.product.mode", theParameter.ReadProductMode);
+  Interface_Static::SetIVal("read.step.product.context", theParameter.ReadProductContext);
+  Interface_Static::SetIVal("read.step.shape.repr", theParameter.ReadShapeRepr);
+  Interface_Static::SetIVal("read.step.tessellated", theParameter.ReadTessellated);
+  Interface_Static::SetIVal("read.step.assembly.level", theParameter.ReadAssemblyLevel);
+  Interface_Static::SetIVal("read.step.shape.relationship", theParameter.ReadRelationship);
+  Interface_Static::SetIVal("read.step.shape.aspect", theParameter.ReadShapeAspect);
+  Interface_Static::SetIVal("read.step.constructivegeom.relationship", theParameter.ReadConstrRelation);
+  Interface_Static::SetIVal("read.stepcaf.subshapes.name", theParameter.ReadSubshapeNames);
+  Interface_Static::SetIVal("read.step.codepage", theParameter.ReadCodePage);
+  Interface_Static::SetIVal("read.step.nonmanifold", theParameter.ReadNonmanifold);
+  Interface_Static::SetIVal("read.step.ideas", theParameter.ReadIdeas);
+  Interface_Static::SetIVal("read.step.all.shapes", theParameter.ReadAllShapes);
+  Interface_Static::SetIVal("read.step.root.transformation", theParameter.ReadRootTransformation);
+
+  Interface_Static::SetIVal("write.precision.mode", theParameter.WritePrecisionMode);
+  Interface_Static::SetRVal("write.precision.val", theParameter.WritePrecisionVal);
+  Interface_Static::SetIVal("write.step.assembly", theParameter.WriteAssembly);
+  Interface_Static::SetIVal("write.step.schema", theParameter.WriteSchema);
+  Interface_Static::SetIVal("write.step.tessellated", theParameter.WriteTessellated);
+  Interface_Static::SetCVal("write.step.product.name", theParameter.WriteProductName.ToCString());
+  Interface_Static::SetIVal("write.surfacecurve.mode", theParameter.WriteSurfaceCurMode);
+  Interface_Static::SetIVal("write.step.unit", theParameter.WriteUnit);
+  Interface_Static::SetCVal("write.resource.name", theParameter.WriteResourceName.ToCString());
+  Interface_Static::SetCVal("write.step.sequence", theParameter.WriteSequence.ToCString());
+  Interface_Static::SetIVal("write.step.vertex.mode", theParameter.WriteVertexMode);
+  Interface_Static::SetIVal("write.stepcaf.subshapes.name", theParameter.WriteSubshapeNames);
+}
+
+//=======================================================================
+// function : resetStatic
+// purpose  :
+//=======================================================================
+void STEPCAFControl_Provider::resetStatic()
+{
+  setStatic(myOldValues);
 }
 
 //=======================================================================
@@ -309,120 +162,48 @@ bool STEPCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
 {
   if (theDocument.IsNull())
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Null document";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: theDocument shouldn't be null";
     return false;
   }
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  XCAFDoc_DocumentTool::SetLengthUnit(theDocument,
-                                      aNode->GlobalParameters.LengthUnit,
-                                      UnitsMethods_LengthUnit_Millimeter);
-  const Standard_Boolean toUseLoaded = thePath == ".";
-  TCollection_AsciiString aFile;
-  if (toUseLoaded)
+  Handle(STEPCAFControl_ConfigurationNode) aNode = Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
+
+  XCAFDoc_DocumentTool::SetLengthUnit(theDocument, aNode->GlobalParameters.LengthUnit, UnitsMethods_LengthUnit_Millimeter);
+  STEPCAFControl_Reader aReader;
+  if (!theWS.IsNull())
   {
-    aFile = theWS->LoadedFile();
-    Message::SendInfo() << "Model taken from the STEP session : "
-      << aFile;
+    aReader.Init(theWS);
   }
-  else
-  {
-    aFile = thePath;
-    Message::SendInfo() << "File STEP to read : "
-      << aFile;
-  }
-  STEPCAFControl_Reader aReader(theWS, !toUseLoaded);
   aReader.SetColorMode(aNode->InternalParameters.ReadColor);
   aReader.SetNameMode(aNode->InternalParameters.ReadName);
   aReader.SetLayerMode(aNode->InternalParameters.ReadLayer);
   aReader.SetPropsMode(aNode->InternalParameters.ReadProps);
+
   IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid;
-  if (!toUseLoaded)
-  {
-    aReadStat = aReader.ReadFile(thePath.ToCString());
-  }
-  else if (theWS->NbStartingEntities() > 0)
-  {
-    aReadStat = IFSelect_RetDone;
-  }
+  aReadStat = aReader.ReadFile(thePath.ToCString());
   if (aReadStat != IFSelect_RetDone)
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : ["
-      << aFile << "] : abandon, no model loaded";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: abandon";
+    resetStatic();
     return false;
   }
+
   if (!aReader.Transfer(theDocument, theProgress))
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : [" <<
-      aFile << "] : Cannot read any relevant data from the STEP file";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: Cannot read any relevant data from the STEP file";
+    resetStatic();
     return false;
   }
-  myProcessedExtFiles = aReader.ExternFiles();
-  return true;
-}
-
-
-//=======================================================================
-// function : Read
-// purpose  :
-//=======================================================================
-bool STEPCAFControl_Provider::Read(std::istream& theIStream,
-                                   const Handle(TDocStd_Document)& theDocument,
-                                   const TCollection_AsciiString theName,
-                                   Handle(XSControl_WorkSession)& theWS,
-                                   const Message_ProgressRange& theProgress)
-{
-  if (theDocument.IsNull())
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Null document";
-    return false;
-  }
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  XCAFDoc_DocumentTool::SetLengthUnit(theDocument,
-                                      aNode->GlobalParameters.LengthUnit,
-                                      UnitsMethods_LengthUnit_Millimeter);
-  Message::SendInfo() << "Model taken from the STEP stream";
-  STEPCAFControl_Reader aReader(theWS);
-  aReader.SetColorMode(aNode->InternalParameters.ReadColor);
-  aReader.SetNameMode(aNode->InternalParameters.ReadName);
-  aReader.SetLayerMode(aNode->InternalParameters.ReadLayer);
-  aReader.SetPropsMode(aNode->InternalParameters.ReadProps);
-  IFSelect_ReturnStatus aReadStat = IFSelect_RetVoid;
-  aReadStat = aReader.ReadStream(theName.ToCString(), theIStream);
-  if (aReadStat != IFSelect_RetDone)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Abandon, no model loaded via stream";
-    return false;
-  }
-  if (!aReader.Transfer(theDocument, theProgress))
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Cannot read any relevant data from the STEP file";
-    return false;
-  }
-  myProcessedExtFiles = aReader.ExternFiles();
+  resetStatic();
   return true;
 }
 
@@ -435,176 +216,86 @@ bool STEPCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
                                     Handle(XSControl_WorkSession)& theWS,
                                     const Message_ProgressRange& theProgress)
 {
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during writing the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  XCAFDoc_DocumentTool::SetLengthUnit(theDocument,
-                                      aNode->GlobalParameters.LengthUnit,
+  Handle(STEPCAFControl_ConfigurationNode) aNode = Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
+
+  XCAFDoc_DocumentTool::SetLengthUnit(theDocument, 
+                                      UnitsMethods::GetLengthUnitScale(aNode->InternalParameters.WriteUnit, UnitsMethods_LengthUnit_Millimeter),
                                       UnitsMethods_LengthUnit_Millimeter);
-  STEPCAFControl_Writer aWriter(theWS, Standard_True);
-  STEPControl_StepModelType aMode =
-    static_cast<STEPControl_StepModelType>(aNode->InternalParameters.WriteModelType);
+  STEPCAFControl_Writer aWriter;
+  if (!theWS.IsNull())
+  {
+    aWriter.Init(theWS);
+  }
+  STEPControl_StepModelType aMode = static_cast<STEPControl_StepModelType>(aNode->InternalParameters.WriteModelType);
   aWriter.SetColorMode(aNode->InternalParameters.WriteColor);
   aWriter.SetNameMode(aNode->InternalParameters.WriteName);
   aWriter.SetLayerMode(aNode->InternalParameters.WriteLayer);
   aWriter.SetPropsMode(aNode->InternalParameters.WriteProps);
 
-  TDF_LabelSequence aLabels;
-  TCollection_AsciiString aLabelsString;
-  for (TColStd_ListOfAsciiString::Iterator anIter(aNode->InternalParameters.WriteLabels);
-       anIter.More(); anIter.Next())
+  TDF_Label aLabel;
+
+  if (!aWriter.Transfer(theDocument, aMode, 0, theProgress))
   {
-    const TCollection_AsciiString& aValue = anIter.Value();
-    TDF_Label aLabel;
-    TDF_Tool::Label(theDocument->Main().Data(), aValue, aLabel, Standard_False);
-    if (aLabel.IsNull())
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during writing the file " <<
+      thePath << "\t: The document cannot be translated or gives no result";
+    resetStatic();
+    return false;
+  }
+  IFSelect_ReturnStatus aStatus = aWriter.Write(thePath.ToCString());
+  switch (aStatus)
+  {
+    case IFSelect_RetVoid:
     {
-      Message::SendFail() << "Error: No label for entry '" << aValue << "'";
+      Message::SendFail() << "Error in the STEPCAFControl_Provider during writing the file " <<
+        thePath << "\t: No file written";
+      resetStatic();
+      return false;;
+    }
+    case IFSelect_RetDone:
+    {
+      break;
+    }
+    default:
+    {
+      Message::SendFail() << "Error in the STEPCAFControl_Provider during writing the file " <<
+        thePath << "\t: Error on writing file";
+      resetStatic();
       return false;
     }
-    if (!aLabelsString.IsEmpty())
-    {
-      aLabelsString += " ";
-    }
-    aLabelsString += aValue;
-    aLabels.Append(aLabel);
   }
-  TCollection_ExtendedString aDocName;
-  Handle(TDataStd_Name) aNameAttr;
-  if (theDocument->GetData()->Root().FindAttribute(TDataStd_Name::GetID(), aNameAttr))
-  {
-    aDocName = aNameAttr->Get();
-  }
-  Standard_Boolean aTransferStatus = Standard_True;
-  Standard_CString aMultiFilePrefix = !aNode->InternalParameters.WriteMultiPrefix.IsEmpty() ?
-    aNode->InternalParameters.WriteMultiPrefix.ToCString() : nullptr;
-  Message::SendInfo() << "Writing STEP file "
-    << thePath;
-  if (aLabels.IsEmpty())
-  {
-    Message::SendInfo() << "Translating labels "
-      << aLabelsString << " of document " << aDocName << " to STEP";
-    aTransferStatus = aWriter.Transfer(theDocument, aMode, aMultiFilePrefix, theProgress);
-  }
-  else
-  {
-    Message::SendInfo() << "Translating document "
-      << aDocName << " to STEP";
-    aTransferStatus = aWriter.Transfer(aLabels, aMode, aMultiFilePrefix, theProgress);
-  }
-  if (!aTransferStatus)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "The document cannot be translated or gives no result";
-    return false;
-  }
-  if (thePath == ".")
-  {
-    Message::SendInfo() << "Document has been translated into the session";
-    return true;
-  }
-  if (aWriter.Write(thePath.ToCString()) != IFSelect_RetDone)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : [" <<
-      thePath << "] : Write failed";
-    return false;
-  }
-  Message::SendInfo() << "STEP file [" << thePath << "] Successfully written";
-  myProcessedExtFiles = aWriter.ExternFiles();
+  resetStatic();
   return true;
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool STEPCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
+                                   const Handle(TDocStd_Document)& theDocument,
+                                   const Message_ProgressRange& theProgress)
+{
+  Handle(XSControl_WorkSession) aWS;
+  return Read(thePath, theDocument, aWS, theProgress);
+}
+
 //=======================================================================
 // function : Write
 // purpose  :
 //=======================================================================
-bool STEPCAFControl_Provider::Write(std::ostream& theOStream,
+bool STEPCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
                                     const Handle(TDocStd_Document)& theDocument,
-                                    Handle(XSControl_WorkSession)& theWS,
                                     const Message_ProgressRange& theProgress)
 {
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  STEPCAFControl_Writer aWriter(theWS, Standard_True);
-  STEPControl_StepModelType aMode =
-    static_cast<STEPControl_StepModelType>(aNode->InternalParameters.WriteModelType);
-  aWriter.SetColorMode(aNode->InternalParameters.WriteColor);
-  aWriter.SetNameMode(aNode->InternalParameters.WriteName);
-  aWriter.SetLayerMode(aNode->InternalParameters.WriteLayer);
-  aWriter.SetPropsMode(aNode->InternalParameters.WriteProps);
-  TDF_LabelSequence aLabels;
-  TCollection_AsciiString aLabelsString;
-  for (TColStd_ListOfAsciiString::Iterator anIter(aNode->InternalParameters.WriteLabels);
-       anIter.More(); anIter.Next())
-  {
-    const TCollection_AsciiString& aValue = anIter.Value();
-    TDF_Label aLabel;
-    TDF_Tool::Label(theDocument->Main().Data(), aValue, aLabel, Standard_False);
-    if (aLabel.IsNull())
-    {
-      Message::SendFail() << "Error: No label for entry '" << aValue << "'";
-      return false;
-    }
-    if (!aLabelsString.IsEmpty())
-    {
-      aLabelsString += " ";
-    }
-    aLabelsString += aValue;
-    aLabels.Append(aLabel);
-  }
-  TCollection_ExtendedString aDocName;
-  Handle(TDataStd_Name) aNameAttr;
-  if (theDocument->GetData()->Root().FindAttribute(TDataStd_Name::GetID(), aNameAttr))
-  {
-    aDocName = aNameAttr->Get();
-  }
-  Standard_Boolean aTransferStatus = Standard_True;
-  Standard_CString aMultiFilePrefix = !aNode->InternalParameters.WriteMultiPrefix.IsEmpty() ?
-    aNode->InternalParameters.WriteMultiPrefix.ToCString() : nullptr;
-  Message::SendInfo() << "Writing STEP file to stream";
-  if (aLabels.IsEmpty())
-  {
-    Message::SendInfo() << "Translating labels "
-      << aLabelsString << " of document " << aDocName << " to STEP";
-    aTransferStatus = aWriter.Transfer(theDocument, aMode, aMultiFilePrefix, theProgress);
-  }
-  else
-  {
-    Message::SendInfo() << "Translating document "
-      << aDocName << " to STEP";
-    aTransferStatus = aWriter.Transfer(aLabels, aMode, aMultiFilePrefix, theProgress);
-  }
-  if (!aTransferStatus)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "The document cannot be translated or gives no result";
-    return false;
-  }
-  if (aWriter.WriteStream(theOStream) != IFSelect_RetDone)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : Write to stream failed";
-    return false;
-  }
-  Message::SendInfo() << "STEP file to stream successfully written";
-  myProcessedExtFiles = aWriter.ExternFiles();
-  return true;
+  Handle(XSControl_WorkSession) aWS;
+  return Write(thePath, theDocument, aWS, theProgress);
 }
 
 //=======================================================================
@@ -617,74 +308,39 @@ bool STEPCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
                                    const Message_ProgressRange& theProgress)
 {
   (void)theProgress;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  STEPControl_Reader aReader(theWS);
-  if (aReader.ReadFile(thePath.ToCString()) != IFSelect_RetDone)
+  Handle(STEPCAFControl_ConfigurationNode) aNode = Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
+  STEPControl_Reader aReader;
+  if(!theWS.IsNull())
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : ["
-      << thePath << "] : abandon, no model loaded";
+    aReader.SetWS(theWS);
+  }
+  IFSelect_ReturnStatus aReadstat = IFSelect_RetVoid;
+  aReadstat = aReader.ReadFile(thePath.ToCString());
+  if (aReadstat != IFSelect_RetDone)
+  {
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: abandon, no model loaded";
+    resetStatic();
     return false;
   }
   Handle(StepData_StepModel) aModel = Handle(StepData_StepModel)::DownCast(aReader.Model());
   aModel->SetLocalLengthUnit(aNode->GlobalParameters.LengthUnit);
   if (aReader.TransferRoots() <= 0)
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : [" <<
-      thePath << "] : Cannot read any relevant data from the STEP file";
-    return false;
-  }
-  theShape = aReader.OneShape();
-  return true;
-}
-
-//=======================================================================
-// function : Read
-// purpose  :
-//=======================================================================
-bool STEPCAFControl_Provider::Read(std::istream& theIStream,
-                                   TopoDS_Shape& theShape,
-                                   const TCollection_AsciiString theName,
-                                   Handle(XSControl_WorkSession)& theWS,
-                                   const Message_ProgressRange& theProgress)
-{
-  (void)theProgress;
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  STEPControl_Reader aReader(theWS);
-  if (aReader.ReadStream(theName.ToCString(), theIStream) != IFSelect_RetDone)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Abandon, no model loaded from STEP stream";
-    return false;
-  }
-  Handle(StepData_StepModel) aModel = Handle(StepData_StepModel)::DownCast(aReader.Model());
-  aModel->SetLocalLengthUnit(aNode->GlobalParameters.LengthUnit);
-  if (aReader.TransferRoots() <= 0)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Cannot read any relevant data from the STEP stream";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t:Cannot read any relevant data from the STEP file";
+    resetStatic();
     return false;
   }
   theShape = aReader.OneShape();
+  resetStatic();
   return true;
 }
 
@@ -697,94 +353,63 @@ bool STEPCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
                                     Handle(XSControl_WorkSession)& theWS,
                                     const Message_ProgressRange& theProgress)
 {
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
+  if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: Incorrect or empty Configuration Node";
     return false;
   }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  STEPControl_Writer aWriter(theWS, Standard_True);
-  Handle(StepData_StepModel) aModel = aWriter.Model();
-  Standard_Integer aNbEntities = (aModel.IsNull() ? 0 : aModel->NbEntities());
-  aModel->SetWriteLengthUnit(UnitsMethods::GetLengthUnitScale(
-    aNode->InternalParameters.WriteUnit,
-    UnitsMethods_LengthUnit_Millimeter));
-  IFSelect_ReturnStatus aWritestat =
-    aWriter.Transfer(theShape, aNode->InternalParameters.WriteModelType, true, theProgress);
-  if (aNbEntities > 0)
+  Handle(STEPCAFControl_ConfigurationNode) aNode = Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
+  initStatic(aNode);
+
+  STEPControl_Writer aWriter;
+  if(!theWS.IsNull())
   {
-    Message::SendTrace() << "STEPCAFControl_Provider : Model not empty before transferring";
+    aWriter.SetWS(theWS);
   }
+  IFSelect_ReturnStatus aWritestat = IFSelect_RetVoid;
+  Handle(StepData_StepModel) aModel = aWriter.Model();
+  aModel->SetWriteLengthUnit(UnitsMethods::GetLengthUnitScale(aNode->InternalParameters.WriteUnit, UnitsMethods_LengthUnit_Millimeter));
+  aWritestat = aWriter.Transfer(theShape, aNode->InternalParameters.WriteModelType, true, theProgress);
   if (aWritestat != IFSelect_RetDone)
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Can't translate shape to STEP model";
+    Message::SendFail() << "Error in the STEPCAFControl_Provider during reading the file " <<
+      thePath << "\t: abandon, no model loaded";
+    resetStatic();
     return false;
   }
-  if (thePath == ".")
-  {
-    Message::SendInfo() << "Step model has been translated into the session";
-    return true;
-  }
   if (aWriter.Write(thePath.ToCString()) != IFSelect_RetDone)
   {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Can't write STEP file " << thePath;
+    Message::SendFail() << "STEPCAFControl_Provider: Error on writing file";
+    resetStatic();
     return false;
   }
+  resetStatic();
   return true;
 }
 
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool STEPCAFControl_Provider::Read(const TCollection_AsciiString& thePath,
+                                   TopoDS_Shape& theShape,
+                                   const Message_ProgressRange& theProgress)
+{
+  Handle(XSControl_WorkSession) aWS;
+  return Read(thePath, theShape, aWS, theProgress);
+}
+
 //=======================================================================
 // function : Write
 // purpose  :
 //=======================================================================
-bool STEPCAFControl_Provider::Write(std::ostream& theOStream,
+bool STEPCAFControl_Provider::Write(const TCollection_AsciiString& thePath,
                                     const TopoDS_Shape& theShape,
-                                    Handle(XSControl_WorkSession)& theWS,
                                     const Message_ProgressRange& theProgress)
 {
-  if (GetNode().IsNull() ||
-      !GetNode()->IsKind(STANDARD_TYPE(STEPCAFControl_ConfigurationNode)))
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Incorrect or empty Configuration Node";
-    return false;
-  }
-  Handle(STEPCAFControl_ConfigurationNode) aNode =
-    Handle(STEPCAFControl_ConfigurationNode)::DownCast(GetNode());
-  STEPCAFControl_ParameterController aParamController(aNode, myToUpdateStaticParameters);
-  personizeWS(theWS);
-  STEPControl_Writer aWriter(theWS, Standard_True);
-  Handle(StepData_StepModel) aModel = aWriter.Model();
-  Standard_Integer aNbEntities = (aModel.IsNull() ? 0 : aModel->NbEntities());
-  aModel->SetWriteLengthUnit(UnitsMethods::GetLengthUnitScale(
-    aNode->InternalParameters.WriteUnit,
-    UnitsMethods_LengthUnit_Millimeter));
-  IFSelect_ReturnStatus aWritestat =
-    aWriter.Transfer(theShape, aNode->InternalParameters.WriteModelType, true, theProgress);
-  if (aNbEntities > 0)
-  {
-    Message::SendTrace() << "STEPCAFControl_Provider : Model not empty before transferring";
-  }
-  if (aWritestat != IFSelect_RetDone)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Can't translate shape to STEP model";
-    return false;
-  }
-  if (aWriter.WriteStream(theOStream) != IFSelect_RetDone)
-  {
-    Message::SendFail() << "Error: STEPCAFControl_Provider : "
-      << "Can't write STEP to stream";
-    return false;
-  }
-  return true;
+  Handle(XSControl_WorkSession) aWS;
+  return Write(thePath, theShape, aWS, theProgress);
 }
 
 //=======================================================================

src/STEPCAFControl/STEPCAFControl_Provider.hxx

@@ -16,7 +16,6 @@
 
 #include <DE_Provider.hxx>
 #include <STEPCAFControl_ConfigurationNode.hxx>
-#include <STEPCAFControl_ExternFile.hxx>
 
 //! The class to transfer STEP files.
 //! Reads and Writes any STEP files into/from OCCT.
@@ -55,19 +54,6 @@ public:
                                     Handle(XSControl_WorkSession)& theWS,
                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
-  //! Reads a CAD file, according internal configuration
-  //! @param[in] theIStream stream to import STEP data
-  //! @param[out] theDocument document to save result
-  //! @paramp[in] theName name of step file, can be empty
-  //! @param[in] theWS current work session
-  //! @param theProgress[in] progress indicator
-  //! @return true if Read operation has ended correctly
-  Standard_EXPORT virtual bool Read(std::istream& theIStream,
-                                    const Handle(TDocStd_Document)& theDocument,
-                                    const TCollection_AsciiString theName,
-                                    Handle(XSControl_WorkSession)& theWS,
-                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
-
   //! Writes a CAD file, according internal configuration
   //! @param[in] thePath path to the export CAD file
   //! @param[out] theDocument document to export
@@ -79,16 +65,23 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Writes a CAD file, according internal configuration
-  //! @param[in] theOStream stream to export STEP data
+  //! @param[in] thePath path to the export CAD file
   //! @param[out] theDocument document to export
-  //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
   //! @return true if Write operation has ended correctly
-  Standard_EXPORT virtual bool Write(std::ostream& theOStream,
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
                                      const Handle(TDocStd_Document)& theDocument,
-                                     Handle(XSControl_WorkSession)& theWS,
-                                     const Message_ProgressRange& theProgress = Message_ProgressRange());
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
@@ -101,19 +94,6 @@ public:
                                     Handle(XSControl_WorkSession)& theWS,
                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
-  //! Reads a CAD file, according internal configuration
-  //! @param[in] theIStream stream to the step file
-  //! @param[out] theShape shape to save result
-  //! @paramp[in] theName name of step file, can be empty
-  //! @param[in] theWS current work session
-  //! @param theProgress[in] progress indicator
-  //! @return true if Read operation has ended correctly
-  Standard_EXPORT virtual bool Read(std::istream& theIStream,
-                                    TopoDS_Shape& theShape,
-                                    const TCollection_AsciiString theName,
-                                    Handle(XSControl_WorkSession)& theWS,
-                                    const Message_ProgressRange& theProgress = Message_ProgressRange());
-
   //! Writes a CAD file, according internal configuration
   //! @param[in] thePath path to the export CAD file
   //! @param[out] theShape shape to export
@@ -125,16 +105,23 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Writes a CAD file, according internal configuration
-  //! @param[in] theOStream stream to export STEP data
+  //! @param[in] thePath path to the export CAD file
   //! @param[out] theShape shape to export
-  //! @param[in] theWS current work session
   //! @param theProgress[in] progress indicator
   //! @return true if Write operation has ended correctly
-  Standard_EXPORT virtual bool Write(std::ostream& theOStream,
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
                                      const TopoDS_Shape& theShape,
-                                     Handle(XSControl_WorkSession)& theWS,
-                                     const Message_ProgressRange& theProgress = Message_ProgressRange());
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
 public:
 
@@ -146,34 +133,18 @@ public:
   //! @return provider's vendor name
   Standard_EXPORT virtual TCollection_AsciiString GetVendor() const Standard_OVERRIDE;
 
-public:
+ private:
 
-  //! Sets parameter to update static parameter, that true by default
-  void SetToUpdateStaticParameters(const bool theToUpdate) { myToUpdateStaticParameters = theToUpdate; }
+   //! Initialize static variables
+   void initStatic(const Handle(DE_ConfigurationNode)& theNode);
 
-  //! Gets parameter to update static parameter, that true by default
-  bool ToUpdateStaticParameters() const { return myToUpdateStaticParameters; }
+   //! Initialize static variables
+   void setStatic(const STEPCAFControl_ConfigurationNode::STEPCAFControl_InternalSection theParameter);
 
-public:
+   //! Reset used interface static variables
+   void resetStatic();
 
-  //! Gets external files used in the last read or write process.
-  //! Processed only on multifile setting up
-  NCollection_DataMap<TCollection_AsciiString, Handle(STEPCAFControl_ExternFile)> GetExternalFiles() const
-  {
-    return myProcessedExtFiles;
-  }
-
-private:
-
-  //! Personizes work session with current format.
-  //! Creates new temporary session if current session is null
-  //! @param[in] theWS current work session
-  void personizeWS(Handle(XSControl_WorkSession)& theWS);
-
-private:
-
-  bool myToUpdateStaticParameters = true; //!< Flag to updating static parameters
-  NCollection_DataMap<TCollection_AsciiString, Handle(STEPCAFControl_ExternFile)> myProcessedExtFiles; //!< External files from the last operation
+   STEPCAFControl_ConfigurationNode::STEPCAFControl_InternalSection myOldValues;
 
 };
 

src/Vrml/Vrml_Provider.cxx

@@ -51,6 +51,30 @@ bool Vrml_Provider::Read(const TCollection_AsciiString& thePath,
                          const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Read(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool Vrml_Provider::Write(const TCollection_AsciiString& thePath,
+                          const Handle(TDocStd_Document)& theDocument,
+                          Handle(XSControl_WorkSession)& theWS,
+                          const Message_ProgressRange& theProgress)
+{
+  (void)theWS;
+  return Write(thePath, theDocument, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool Vrml_Provider::Read(const TCollection_AsciiString& thePath,
+                         const Handle(TDocStd_Document)& theDocument,
+                         const Message_ProgressRange& theProgress)
+{
   if (theDocument.IsNull())
   {
     Message::SendFail() << "Error in the Vrml_Provider during reading the file " <<
@@ -94,10 +118,8 @@ bool Vrml_Provider::Read(const TCollection_AsciiString& thePath,
 //=======================================================================
 bool Vrml_Provider::Write(const TCollection_AsciiString& thePath,
                           const Handle(TDocStd_Document)& theDocument,
-                          Handle(XSControl_WorkSession)& theWS,
                           const Message_ProgressRange& theProgress)
 {
-  (void)theWS;
   (void)theProgress;
   if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(Vrml_ConfigurationNode)))
   {
@@ -130,6 +152,30 @@ bool Vrml_Provider::Read(const TCollection_AsciiString& thePath,
                          const Message_ProgressRange& theProgress)
 {
   (void)theWS;
+  return Read(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Write
+// purpose  :
+//=======================================================================
+bool Vrml_Provider::Write(const TCollection_AsciiString& thePath,
+                          const TopoDS_Shape& theShape,
+                          Handle(XSControl_WorkSession)& theWS,
+                          const Message_ProgressRange& theProgress)
+{
+  (void)theWS;
+  return Write(thePath, theShape, theProgress);
+}
+
+//=======================================================================
+// function : Read
+// purpose  :
+//=======================================================================
+bool Vrml_Provider::Read(const TCollection_AsciiString& thePath,
+                         TopoDS_Shape& theShape,
+                         const Message_ProgressRange& theProgress)
+{
   (void)theProgress;
   if (GetNode().IsNull() || !GetNode()->IsKind(STANDARD_TYPE(Vrml_ConfigurationNode)))
   {
@@ -225,13 +271,12 @@ bool Vrml_Provider::Read(const TCollection_AsciiString& thePath,
 //=======================================================================
 bool Vrml_Provider::Write(const TCollection_AsciiString& thePath,
                           const TopoDS_Shape& theShape,
-                          Handle(XSControl_WorkSession)& theWS,
                           const Message_ProgressRange& theProgress)
 {
   Handle(TDocStd_Document) aDoc = new TDocStd_Document("BinXCAF");
   Handle(XCAFDoc_ShapeTool) aShTool = XCAFDoc_DocumentTool::ShapeTool(aDoc->Main());
   aShTool->AddShape(theShape);
-  return Write(thePath, aDoc, theWS, theProgress);
+  return Write(thePath, aDoc, theProgress);
 }
 
 //=======================================================================

src/Vrml/Vrml_Provider.hxx

@@ -64,6 +64,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theDocument document to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    const Handle(TDocStd_Document)& theDocument,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theDocument document to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const Handle(TDocStd_Document)& theDocument,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
   //! Reads a CAD file, according internal configuration
   //! @param[in] thePath path to the import CAD file
   //! @param[out] theShape shape to save result
@@ -86,6 +104,24 @@ public:
                                      Handle(XSControl_WorkSession)& theWS,
                                      const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
 
+  //! Reads a CAD file, according internal configuration
+  //! @param[in] thePath path to the import CAD file
+  //! @param[out] theShape shape to save result
+  //! @param theProgress[in] progress indicator
+  //! @return true if Read operation has ended correctly
+  Standard_EXPORT virtual bool Read(const TCollection_AsciiString& thePath,
+                                    TopoDS_Shape& theShape,
+                                    const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
+  //! Writes a CAD file, according internal configuration
+  //! @param[in] thePath path to the export CAD file
+  //! @param[out] theShape shape to export
+  //! @param theProgress[in] progress indicator
+  //! @return true if Write operation has ended correctly
+  Standard_EXPORT virtual bool Write(const TCollection_AsciiString& thePath,
+                                     const TopoDS_Shape& theShape,
+                                     const Message_ProgressRange& theProgress = Message_ProgressRange()) Standard_OVERRIDE;
+
 public:
 
   //! Gets CAD format name of associated provider

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/de/step_3/A1

@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR00000 ALL: Error: First - file was not read - exception " 
-puts "TODO CR00000 ALL: Error : Here is reading problem" 
-puts "TODO CR00000 ALL: Error: STEPCAFControl_Provider" 
+puts "TODO CR23096 ALL: Error: First - file was not read - exception " 
+puts "TODO CR23096 ALL: Error : Here is reading problem" 
+
 
 set filename tr9_r0301-pe-adjusted.stp

tests/de/step_5/B6

@@ -1,7 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR00000 ALL: Error: First - file was not read - exception " 
-puts "TODO CR00000 ALL: Error : Here is reading problem" 
-puts "TODO CR00000 ALL: Error: STEPCAFControl_Provider" 
+puts "TODO CR23096 ALL: Error: First - file was not read - exception " 
+puts "TODO CR23096 ALL: Error : Here is reading problem" 
 
 
 set filename buc60990.stp

tests/de_mesh/gltf_read/helmet

@@ -2,7 +2,9 @@ puts "========"
 puts "0030691: test glTF reader on standard sample models"
 puts "========"
 
-set anAssetInfo [ReadGltf D [locate_data_file bug30691_DamagedHelmet.gltf] -assetInfo]
+ReadGltf D [locate_data_file bug30691_DamagedHelmet.gltf]
+
+set anAssetInfo [ReadGltf [locate_data_file bug30691_DamagedHelmet.gltf] -assetInfo]
 if { "$anAssetInfo" != "generator: Khronos Blender glTF 2.0 exporter" } { puts "Error: unexpected asset info" }
 
 XGetOneShape s D

tests/de_mesh/stl_read/D1

@@ -49,12 +49,7 @@ set fd [open ${imagedir}/${casename}_zero_ascii_dos.stl w]
 fconfigure $fd -translation crlf
 puts $fd "solid \nendsolid"
 close $fd
-puts "REQUIRED ALL: Error: RWStl_Provider :"
-catch {
-  if {[readstl res_zero_ascii_dos ${imagedir}/${casename}_zero_ascii_dos.stl -brep]} {
-    puts "Error: empty file should be marked as invalid input file"
-  }
-}
+readstl res_zero_ascii_dos ${imagedir}/${casename}_zero_ascii_dos.stl -brep
 
 puts "\n#======================================================================"
 puts "# Ascii file with no facets, LF"
@@ -63,11 +58,7 @@ set fd [open ${imagedir}/${casename}_zero_ascii_unix.stl w]
 fconfigure $fd -translation lf
 puts $fd "solid \nendsolid"
 close $fd
-catch {
-  if {[readstl res_zero_ascii_unix ${imagedir}/${casename}_zero_ascii_unix.stl -brep] != 1} {
-    puts "Error: empty file should be marked as invalid input file"
-  }
-}
+readstl res_zero_ascii_unix ${imagedir}/${casename}_zero_ascii_unix.stl -brep
 
 puts "\n#======================================================================"
 puts "# Binary file with single facet"
@@ -88,11 +79,7 @@ set fd [open ${imagedir}/${casename}_zero_binary.stl w]
 fconfigure $fd -translation binary
 puts -nonewline $fd "stl [string repeat { } 76][binary format i 0]"
 close $fd
-catch {
-  if {[readstl res_zero_binary ${imagedir}/${casename}_zero_binary.stl -brep] != 1} {
-    puts "Error: empty file should be marked as invalid input file"
-  }
-}
+readstl res_zero_binary ${imagedir}/${casename}_zero_binary.stl -brep
 
 puts "\n#======================================================================"
 puts "# Empty file"
@@ -100,9 +87,5 @@ puts "#======================================================================"
 puts "REQUIRED ALL: Error: premature end of file"
 set fd [open ${imagedir}/${casename}_empty.stl w]
 close $fd
-catch {
-  if {[readstl res_empty ${imagedir}/${casename}_empty.stl -brep] != 1} {
-    puts "Error: empty file should be marked as invalid input file"
-  }
-}
+readstl res_empty ${imagedir}/${casename}_empty.stl -brep
 

tests/de_wrapper/configuration/A3

@@ -53,9 +53,7 @@ provider.STEP.OCC.write.product.name :
 provider.STEP.OCC.write.surfacecurve.mode :      1
 provider.STEP.OCC.write.unit :      2
 provider.STEP.OCC.write.resource.name :  STEP
-provider.STEP.OCC.write.multi.prefix :
 provider.STEP.OCC.write.sequence :       ToSTEP
-provider.STEP.OCC.write.labels :
 provider.STEP.OCC.write.vertex.mode :    0
 provider.STEP.OCC.write.stepcaf.subshapes.name :         0
 provider.STEP.OCC.write.color :  1
@@ -70,14 +68,13 @@ provider.VRML.OCC.read.fill.incomplete :         1
 provider.VRML.OCC.writer.version :       2
 provider.VRML.OCC.write.representation.type :    1
 provider.STL.OCC.read.merge.angle :      90
-provider.STL.OCC.read.brep :     1
+provider.STL.OCC.read.brep :     0
 provider.STL.OCC.write.ascii :   1
 provider.OBJ.OCC.file.length.unit :      1
 provider.OBJ.OCC.system.cs :     0
 provider.OBJ.OCC.file.cs :       1
 provider.OBJ.OCC.read.single.precision :         0
 provider.OBJ.OCC.read.create.shapes :    0
-provider.OBJ.OCC.read.create.single :	 0
 provider.OBJ.OCC.read.root.prefix :
 provider.OBJ.OCC.read.fill.doc :         1
 provider.OBJ.OCC.read.fill.incomplete :  1
@@ -105,19 +102,10 @@ provider.GLTF.OCC.write.author :
 provider.GLTF.OCC.write.trsf.format :    0
 provider.GLTF.OCC.write.node.name.format :       3
 provider.GLTF.OCC.write.mesh.name.format :       1
-provider.GLTF.OCC.write.draco.compression :	 0
-provider.GLTF.OCC.write.draco.level :	 7
-provider.GLTF.OCC.write.draco.position.bits :	 14
-provider.GLTF.OCC.write.draco.normal.bits :	 10
-provider.GLTF.OCC.write.draco.texture.bits :	 12
-provider.GLTF.OCC.write.draco.color.bits :	 8
-provider.GLTF.OCC.write.draco.generic.bits :	 12
-provider.GLTF.OCC.write.draco.unified.quantization :	 0
 provider.GLTF.OCC.write.forced.uv.export :       0
 provider.GLTF.OCC.write.embed.textures.in.glb :  1
 provider.GLTF.OCC.write.merge.faces :    0
 provider.GLTF.OCC.write.split.indices16 :        0
-provider.GLTF.OCC.write.parallel :	 0
 provider.BREP.OCC.write.binary :         1
 provider.BREP.OCC.write.version.binary :         4
 provider.BREP.OCC.write.version.ascii :  3

tests/de_wrapper/configuration/A4

@@ -53,9 +53,7 @@ provider.STEP.OCC.write.product.name :
 provider.STEP.OCC.write.surfacecurve.mode :      1
 provider.STEP.OCC.write.unit :      2
 provider.STEP.OCC.write.resource.name :  STEP
-provider.STEP.OCC.write.multi.prefix :
 provider.STEP.OCC.write.sequence :       ToSTEP
-provider.STEP.OCC.write.labels :
 provider.STEP.OCC.write.vertex.mode :    0
 provider.STEP.OCC.write.stepcaf.subshapes.name :         0
 provider.STEP.OCC.write.color :  1

tests/de_wrapper/iges/A6

@@ -96,7 +96,7 @@ if [catch {ReadFile D7 $write_path -conf "global.general.length.unit : 0.0254 "}
 }
 XGetOneShape S7 D7
 
-array set areas {0 11995.4 1 0.0119954 2 11979.2 3 11979.2 4 11979.2 5 0.0119792 6 11979.2 7 18.5678}
+array set areas {0 11995.4 1 0.0119954 2 47916.8 3 11979.2 4 0.0479168 5 0.0119792 6 47916.8 7 18.5678}
 array set results {0 S0 1 S1 2 S2 3 S3 4 S4 5 S5 6 S6 7 S7}
 for { set anind 0} { $anind < 8 } { incr anind } {
   checkprops $results($anind) -s $areas($anind) -eps 1e-2

tests/de_wrapper/obj/A5

@@ -52,7 +52,7 @@ if [catch {readfile S5 $filename -conf "global.general.length.unit : 1000 "} cat
     puts "OK : Reading is correct"
 }
 
-array set areas {0 1.21752e+13 1 1.21752e+07 2 1.21752e+13 3 1.21752e+07 4 1.21752e+13 5 1.21752e+07}
+array set areas {0 1.21752e+07 1 1.21752e+07 2 1.21752e+13 3 1.21752e+07 4 1.21752e+13 5 1.21752e+07}
 array set results {0 res0 1 res1 2 S2 3 S3 4 S4 5 S5}
 for { set anind 0} { $anind < 6 } { incr anind } {
   checkprops $results($anind) -s $areas($anind) -eps 1e-2

tests/de_wrapper/obj/A6

@@ -96,7 +96,7 @@ if [catch {ReadFile D7 $write_path -conf "global.general.length.unit : 1000 "} c
 }
 XGetOneShape S7 D7
 
-array set areas {0 1.21752e+13 1 12.1752 2 1.21752e+13 3 1.21752e+13 4 12.1752 5 12.1752 6 1.21752e+13 7 1.21773e-05}
+array set areas {0 1.21752e+07 1 12.1752 2 1.21752e+07 3 1.21752e+07 4 12.1752 5 12.1752 6 1.21752e+07 7 1.21773e-05}
 array set results {0 S0 1 S1 2 S2 3 S3 4 S4 5 S5 6 S6 7 S7}
 for { set anind 0} { $anind < 8 } { incr anind } {
   checkprops $results($anind) -s $areas($anind) -eps 1e-2

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