// trying to avoid regressions

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

dox/FILES_HTML.txt

@@ -45,7 +45,6 @@ user_guides/visualization/visualization.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
-user_guides/de_wrapper/de_wrapper.md
 user_guides/ocaf/ocaf.md
 user_guides/draw_test_harness/draw_test_harness.md
 user_guides/inspector/inspector.md

dox/FILES_PDF.txt

@@ -20,7 +20,6 @@ user_guides/vis/vis.md
 user_guides/iges/iges.md
 user_guides/step/step.md
 user_guides/xde/xde.md
-user_guides/de_wrapper/de_wrapper.md
 user_guides/inspector/inspector.md
 user_guides/draw_test_harness/draw_test_harness.md
 

dox/user_guides/de_wrapper/de_wrapper.md

@@ -1,413 +0,0 @@
-Data Exchange Wrapper (DE_Wrapper)  {#occt_user_guides__de_wrapper}
-============================
-
-@tableofcontents
-
-@section occt_de_wrapper_1 Introduction
-
-This guide explains how to use the **Data Exchange Wrapper** (DE Wrapper).
-It provides basic directions on setup, usage and file creation via DE_Wrapper.
-
-The Data Exchange Wrapper (DE Wrapper) module allows reading and writing supported CAD formats to shape objects or special XDE documents, setting up the transfer process for all CAD files.
-
-It is also possible to add support for new CAD formats by prototyping existing tools.
-
-The DE Wrapper component requires @ref occt_user_guides__xde "XDE" toolkit for operation.
-
-This guide mainly explains how to convert CAD files to Open CASCADE Technology (OCCT) shapes and vice versa.
-This guide principally deals with the following OCCT classes:
-  * The Provider class, which loads CAD files and translates their contents to OCCT shapes or XDE documents, or translates OCCT shapes or XDE documents to CAD entities and then writes those entities to a CAD file.
-  * The Configuration class, which contains all information for the transfer process, such as the units, tolerance, and all internal information for the OCC readers or writers.
-  * The wrapper class, which contains all loaded configuration objects with own CAD format, reads or writes CAD files in the format derived from file extension or contents and saves or loads configuration settings for loaded configuration objects.
-
-@section occt_de_wrapper_2 Supported CAD formats
-
-| CAD format | Extensions | RW support | Thread Safety | Presentation | Package |
-| :--------- | :--------- | :--------- | :----------- | :----------- | :------ |
-| STEP | .stp, .step .stepz | RW | No | BRep, Mesh | STEPCAFControl |
-| XCAF | .xbf | RW | Yes | BRep, Mesh | DEXCAFCascade |
-| BREP | .brep | RW | Yes | BRep, Mesh | DEBRepCascade |
-| IGES | .igs, .iges | RW | No | BRep | IGESCAFControl |
-| OBJ | .obj | RW | Yes | Mesh | RWObj |
-| STL | .stl | RW | Yes | Mesh | RWStl |
-| PLY | .ply | W | Yes | Mesh | RWPly |
-| GLTF | .glTF .glb | RW | Yes | Mesh | RWGltf |
-| VRML | .wrl .vrml | RW | Yes | Mesh | Vrml |
-
-**Note** :
-  * The format names in the first column match the FormatName values used for configuration nodes.
-  * The VendorName for all listed CAD formats is "OCC".
-
-@section occt_de_wrapper_3 DE Session Configuration
-
-Any providers can have their own read/write parameters. The transfer process is set up using DE configuration nodes, which hold all relevant parameters. There are two ways to change the parameter values: directly from code or by an external resource file/string.
-The session is a global or static DE_Wrapper object that stores registered DE configuration nodes and wraps DE commands to work with them. It has some configuration parameters of its own and also keeps track of loaded nodes and specilal global parameters.
-
-@subsection occt_de_wrapper_3_1 Getting a DE session. Code sample
-
-Working with a DE session requires a DE_Wrapper object to be loaded or created first.
-
-Getting the global DE_Wrapping object:
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-~~~~
-Creating a local DE_Wrapper:
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = new DE_Wrapper();
-~~~~
-It is recommended to create a local one-time copy to work with the session, if no global changes are intended.
-~~~~{.cpp}
-Handle(DE_Wrapper) aOneTimeSession = aSession->Copy();
-~~~~
-@subsection occt_de_wrapper_3_2 Configuration resource
-
-Configuration resource is an external file or string of the following format:
-~~~~{.cpp}
-global.priority.STEP :   OCC DTK
-global.general.length.unit :     1
-provider.STEP.OCC.read.precision.val :   0.0001
-~~~~
-
-@subsubsection occt_de_wrapper_3_2_1 Configuration resource: graph of scopes
-   * **global.** is a scope of global parameters
-     *  **priority.** is a scope of priority to use vendors with their providers.
-     *  **general.** is a scope of global configuration parameter values
-     *  <strong>"..."</strong> is an internal configuration with any internal scopes
-     *  <strong>". : "</strong> is a separator of key-value
-     *  __...__ parameter value, can't contain new line symbols.
-   * **provider.** is a scope of configuration providers
-     *  **STEP.** is a scope of CAD format to configure
-     *  **OCC.** is a scope of a vendor or provider
-     *  <strong>"..."</strong> is an internal configuration with any internal scopes
-     *  <strong>". : "</strong> is a separator of key-value
-     *  <strong>"..."</strong> parameter value, can't contain new line symbols.
-
-@subsubsection occt_de_wrapper_3_2_2 Loading configuration resources. Configuring DE Session
-
-The resource should be loaded after the registration of all providers that should be configured. The resource only impacts registered parameters. To configure a new registered provider it is necessary to load the resource again. Parameters not present in the resource will remain unchanged.
-
-There are two ways to check what parameters are available:
-* C++: Open ConfigureNode file and check the InternalParameter field. Each parameter will be described with a comment. To check the global parameters, use the DE_Wrapper class public methods.
-* Resource: Register all available Nodes to the session, then save the configuration and view all existing parameters.
-
-There are two options for loading a resource: recursive and global parameters only. Recursive is the default option to configure all global parameters (units, priority, enable status) and all registered providers. Non-recursive configures only global parameters and ignores all provider settings. This option is the best for updating provider priority.
-
-@subsubsection occt_de_wrapper_3_2_3 Loading configuration resources. Code sample
-
-Configuring using a resource string:
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aString =
-    "global.priority.STEP :   OCC DTK\n"
-    "global.general.length.unit : 1\n"
-    "provider.STEP.OCC.read.precision.val : 0.\n";
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Load(aString, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-~~~~
-Configuring using a resource file:
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "";
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Load(aPathToFile, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-~~~~
-@subsubsection occt_de_wrapper_3_2_4 Loading configuration resources. DRAW sample
-
-Configuring using a resource string:
-~~~~{.cpp}
-set conf "
-global.priority.STEP :   OCC
-global.general.length.unit :     1
-provider.STEP.OCC.read.iges.bspline.continuity :         1
-provider.STEP.OCC.read.precision.mode :  0
-provider.STEP.OCC.read.precision.val :   0.0001
-"
-LoadConfiguration ${conf} -recursive on
-~~~~
-
-Configuring using a resource file:
-~~~~{.cpp}
-set pathToFile ""
-LoadConfiguration ${pathToFile} -recursive on
-~~~~
-
-@subsubsection occt_de_wrapper_3_2_5 Saving configuration resources. Dump of configuration DE Session
-
-Saving the configuration of a DE Session involves dumping all parameters of registered providers.
-If a parameter did not change during the session, its value remains as default.
-
-There are two ways to save a resource: recursive and global parameters only. Recursive is the way to dump all registered provider information. Non-recursive dumps only global parameters, for example, save priority of vendors or the length unit.
-
-It is possible to filter what vendors or providers to save by providing the correct name of the vendor or provider.
-
-@subsubsection occt_de_wrapper_3_2_6 Saving configuration resources. Code sample
-
-Dump to resource string. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TColStd_ListOfAsciiString aFormats;
-  TColStd_ListOfAsciiString aVendors;
-  aFormats.Appends("STEP");
-  aVendors.Appends("OCC");
-  Standard_Boolean aIsRecursive = Standard_True;
-  TCollection_AsciiString aConf = aSession->aConf->Save(aIsRecursive, aFormats, aVendors);
-~~~~
-Configure using a resource file. If the vendors list is empty, saves all vendors. If the providers list is empty, saves all providers of valid vendors.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "";
-  TColStd_ListOfAsciiString aFormats;
-  TColStd_ListOfAsciiString aVendors;
-  aFormats.Appends("STEP");
-  aVendors.Appends("OCC");
-  Standard_Boolean aIsRecursive = Standard_True;
-  if (!aSession->Save(aPathToFile, aIsRecursive, aFormats,aVendors))
-  {
-    Message::SendFail() << "Error: configuration is not saved";
-  }
-~~~~
-@subsubsection occt_de_wrapper_3_2_7 Saving configuration resources. DRAW sample
-
-Dump configuration to string. If no list of vendors is passed or it is empty, all vendors are saved. If no providers list is passed or it is empty, all providers of valid vendors are saved.
-~~~~{.cpp}
-set vendors "OCC"
-set format "STEP"
-set dump_conf [DumpConfiguration -recursive on -format ${format} -vendor ${vendors}]
-~~~~
-
-Dump configuration to file. If no vendors list are set as an argument or it is empty, saves all vendors. If no providers list as argument or it is empty, saves all providers of valid vendors:
-~~~~{.cpp}
-set vendors "OCC"
-set format "STEP"
-set pathToFile ""
-DumpConfiguration -path ${pathToFile} -recursive on -format ${format} -vendor ${vendors}
-~~~~
-
-@subsection occt_de_wrapper_3_3 Registering providers
-
-To transfer a CAD file using DE Wrapper, it is necessary to register a CAD provider.
-The provider contains internal and global parameters that have default values in the creation stage.
-All registered providers are set to the map with information about its vendor and kept as smart handles. Therefore, it is possible to change the values via handle from external code.
-
-@subsubsection occt_de_wrapper_3_3_1 Registering providers. Code sample
-
-It is nesessary to register only one ConfigurationNode for all needed formats.
-~~~~{.cpp}
-Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-Handle(DE_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
-aSession->Bind(aNode);
-~~~~
-@subsubsection occt_de_wrapper_3_3_2 Registering providers. DRAW Sample
-
-Use DRAW with all providers registered by the following command:
-~~~~{.cpp}
-pload XDE
-~~~~
-
-@subsubsection occt_de_wrapper_3_3_3 Realtime initialization. Code sample
-
-It is possible to change a paramater from code using a smart pointer.
-
-~~~~{.cpp}
-// global variable
-static Handle(STEPCAFControl_ConfigurationNode) THE_STEP_NODE;
-
-static Handle(DE_ConfigurationNode) RegisterStepNode()
-{
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  if (!THE_STEP_NODE.IsNull())
-  {
-    return THE_STEP_NODE;
-  }
-
-  THE_STEP_NODE = new STEPCAFControl_ConfigurationNode();
-  aSession->Bind(THE_STEP_NODE);
-  return THE_STEP_NODE;
-}
-
-// Change parameter value
-THE_STEP_NODE->InternalParameters.ReadRelationship = false;
-THE_STEP_NODE->InternalParameters.ReadName = false;
-THE_STEP_NODE->InternalParameters.ReadProps = false;
-~~~~
-
-@subsection occt_de_wrapper_3_4 Priority of Vendors
-
-DE session is able to work with several vendors with the same supported CAD format. To choose the preffered vendor for each format, use a special priority list.
-
-If the high priority vendor's provider is not supported, a transfer operation is needed (write/read), then the next vendor will be chosen.
-
-@subsubsection occt_de_wrapper_3_4_1 Priority of Vendors. Code sample
-
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aFormat = "STEP";
-  TColStd_ListOfAsciiString aVendors;
-  aVendors.Appends("OCC"); // high priority
-  aVendors.Appends("DTK");
-  // Flag to disable not choosen vendors, in this case configuration is possible
-  // otherwise, lower their priority and continue to check ability to transfer
-  Standard_Boolean aToDisable = Standard_True;
-  aSession->ChangePriority(aFormat, aVendors, aToDisable);
-~~~~
-
-@subsubsection occt_de_wrapper_3_4_2 Priority of Vendors. DRAW Sample
-
-It is recommended to disable recursion and update only global parameters.
-~~~~{.cpp}
-set conf "
-global.priority.STEP :   OCC DTK
-"
-LoadConfiguration ${conf} -recursive off
-~~~~
-
-@section occt_de_wrapper_4 Transfer of CAD files
-
-To transfer from a CAD file to OCC or from OCC to a CAD file, it is necessary to use a configured DE_Wrapper object. It can be local, one-time or global. Global configuration of DE_Wrapper propagates to all nodes via transfer. There are two options for transferring: using OCC shape or XCAF document. It is possible to work only with real path to/from the file. Streaming is not supported (yet).
-
-The format of input/output file is automatically determined by its extension or contents.
-
-@subsection occt_de_wrapper_4_1 Transfer of CAD files. Code samples
-
-Reading STEP file to Shape.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShRes;
-  if (!aSession->Read(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-Writing Shape to STEP file.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShFrom = ...;
-  if (!aSession->Write(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't write file";
-  }
-~~~~
-
-Reading STEP file into XCAF document.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  Handle(TDocStd_Document) aDoc = ...;
-  if (!aSession->Read(aPathToFile, aDoc))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-Writing XCAF document into STEP.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper();
-  TCollection_AsciiString aPathToFile = "example.stp";
-  Handle(TDocStd_Document) aDoc = ...;
-  if (!aSession->Write(aPathToFile, aDoc))
-  {
-    Message::SendFail() << "Error: Can't write file";
-  }
-~~~~
-
-@subsection occt_de_wrapper_4_2 Transfer of CAD files. DRAW samples
-
-Reading a STEP file into a Shape.
-~~~~{.cpp}
-set fileName "sample.stp"
-readfile shape ${fileName}
-~~~~
-
-Writing a Shape into STEP.
-~~~~{.cpp}
-set fileName "sample.stp"
-writefile shape ${fileName}
-~~~~
-
-Reading STEP into XCAF document.
-~~~~{.cpp}
-set fileName "sample.stp"
-ReadFile D ${fileName}
-~~~~
-
-Writing XCAF document into STEP.
-~~~~{.cpp}
-set fileName "sample.stp"
-WriteFile D ${fileName}
-~~~~
-
-@subsection occt_de_wrapper_4_3 Transfer using DE Provider. Code sample
-
-It is possible to read and write CAD files directly from a special provider.
-
-~~~~{.cpp}
-// Creating or getting node
-Handle(STEPCAFControl_ConfigurationNode) aNode = new STEPCAFControl_ConfigurationNode();
-// Creationg an one-time provider
-Handle(DE_Provider) aProvider = aNode->BuildProvider();
-// Setting configuration with all parameters
-aProvider->SetNode(aNode);
-if (!aProvider->Read(...))
-{
-  Message::SendFail() << "Error: Can't read STEP file";
-}
-if (!aProvider->Write(...))
-{
-  Message::SendFail() << "Error: Can't write STEP file";
-}
-~~~~
-
-@subsection occt_de_wrapper_4_4 Temporary configuration via transfer
-
-It is possible to change the configuration of only one transfer operation. To avoid changing parameters in a session, one-time clone of the session can be created and used for transfer. This way is recommended for use in multithreaded mode.
-
-@subsubsection occt_de_wrapper_4_4_1 Temporary configuration via transfer. Code sample
-
-Code sample to configure via transfer.
-~~~~{.cpp}
-  Handle(DE_Wrapper) aSession = DE_Wrapper::GlobalWrapper()->Copy();
-  TCollection_AsciiString aString =
-    "global.priority.STEP :   OCC DTK\n"
-    "global.general.length.unit : 1\n"
-    "provider.STEP.OCC.read.precision.val : 0.\n";
-  if (!aSession->Load(aString, aIsRecursive))
-  {
-    Message::SendFail() << "Error: configuration is incorrect";
-  }
-  TCollection_AsciiString aPathToFile = "example.stp";
-  TopoDS_Shape aShRes;
-  if (!aSession->Read(aPathToFile, aShRes))
-  {
-    Message::SendFail() << "Error: Can't read file";
-  }
-~~~~
-
-@subsubsection occt_de_wrapper_4_4_2 Temporary configuration via transfer. DRAW sample
-
-Code sample to configure via transfer within DRAW command.
-~~~~{.cpp}
-set fileName "sample.stp"
-readfile S5 $filename -conf "global.general.length.unit : 1000 "
-~~~~
-
-Code sample to configure via transfer as variable.
-~~~~{.cpp}
-set fileName "sample.stp"
-set conf "
-global.priority.STEP :   OCC
-global.general.length.unit :     1
-provider.STEP.OCC.read.iges.bspline.continuity :         1
-provider.STEP.OCC.read.precision.mode :  0
-provider.STEP.OCC.read.precision.val :   0.0001
-"
-readfile S5 $filename -conf ${conf}
-~~~~

dox/user_guides/user_guides.md

@@ -13,7 +13,6 @@ OCCT User Guides are organized by OCCT modules:
 * @subpage occt_user_guides__iges "IGES Translator"
 * @subpage occt_user_guides__step "STEP Translator"
 * @subpage occt_user_guides__xde "Extended Data Exchange (XDE)"
-* @subpage occt_user_guides__de_wrapper "Data Exchange Wrapper (DE Wrapper)"
 * @subpage occt_user_guides__ocaf "Open CASCADE Application Framework (OCAF)"
 * @subpage occt_user_guides__test_harness "DRAW Test Harness"
 * @subpage occt_user_guides__inspector "Inspector"

src/BRepBndLib/BRepBndLib.cxx

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

src/BRepOffset/BRepOffset_Analyse.cxx

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

src/BRepOffset/BRepOffset_Error.hxx

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

src/BRepOffset/BRepOffset_MakeOffset.cxx

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

src/BRepTest/BRepTest_CurveCommands.cxx

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

src/BRepTest/BRepTest_FeatureCommands.cxx

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

src/ChFi3d/ChFi3d_Builder_1.cxx

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

src/ChFiDS/ChFiDS_TypeOfConcavity.hxx

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

src/IGESControl/IGESControl_IGESBoundary.cxx

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

src/IGESToBRep/IGESToBRep_BRepEntity.cxx

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

src/IGESToBRep/IGESToBRep_BasicCurve.cxx

@@ -343,7 +343,7 @@ Handle(Geom_Curve) IGESToBRep_BasicCurve::TransferConicArc
     //The dimensions should be also obliged:
     //[a]=[b]=[c]=L^-2
     //if ( (Abs(a-c) <= GetEpsGeom()) && (Abs(b) < GetEpsCoeff()))
-    Standard_Real eps2 = Precision::PConfusion() * Precision::PConfusion();
+    Standard_Real eps2 = (Precision::PConfusion() * Precision::PConfusion()) / GetUnitFactor();
     if ( (Abs(a-c) <= eps2) && (Abs(b) < eps2)) {
     
 //                          =================
@@ -358,8 +358,8 @@ Handle(Geom_Curve) IGESToBRep_BasicCurve::TransferConicArc
 
         t1 = ElCLib::Parameter(circ, startPoint);
         t2 = ElCLib::Parameter(circ, endPoint);
-	if (t1 > t2 && (t1 - t2) > Precision::Confusion()) t2 += 2.*M_PI;
-	if (Abs(t1 - t2) <= Precision::Confusion())  { // t1 = t2
+	if (t1 > t2 && (t1 - t2) > Precision::Confusion() / GetUnitFactor()) t2 += 2.*M_PI;
+	if (Abs(t1 - t2) <= Precision::Confusion() / GetUnitFactor())  { // t1 = t2
 	  Message_Msg msg1160("IGES_1160");
 	  SendWarning(st, msg1160);      
 	}
@@ -1249,7 +1249,7 @@ Handle(Geom_Curve)  IGESToBRep_BasicCurve::TransferLine
 
   // modif du 15/10/97  : test moins severe
   // beaucoup de points confondus a GetEpsGeom()*GetUnitFactor()
-  if (!Ps.IsEqual(Pe,Precision::Confusion())) { //:l3 abv 11 Jan 99: GetEpsGeom()*GetUnitFactor()/10.)) {
+  if (!Ps.IsEqual(Pe,Precision::Confusion() / GetUnitFactor())) { //:l3 abv 11 Jan 99: GetEpsGeom()*GetUnitFactor()/10.)) {
     gp_Lin line(Ps, gp_Dir(gp_Vec(Ps,Pe)));
     Standard_Real t1 = ElCLib::Parameter(line, Ps);
     Standard_Real t2 = ElCLib::Parameter(line, Pe);
@@ -1299,7 +1299,7 @@ Handle(Geom2d_Curve)  IGESToBRep_BasicCurve::Transfer2dLine
 		 start->EndPoint().Y());
   }
 
-  if (!beg.IsEqual(end,Precision::PConfusion())) { //:l3 abv 11 Jan 99: GetEpsCoeff())) {
+  if (!beg.IsEqual(end,Precision::PConfusion() / GetUnitFactor())) { //:l3 abv 11 Jan 99: GetEpsCoeff())) {
     gp_Lin2d line2d(beg, gp_Dir2d(gp_Vec2d(beg,end)));
     Standard_Real t1 = ElCLib::Parameter(line2d, beg);
     Standard_Real t2 = ElCLib::Parameter(line2d, end);

src/IGESToBRep/IGESToBRep_BasicSurface.cxx

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

src/IGESToBRep/IGESToBRep_TopoCurve.cxx

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

tests/bugs/modalg_2/bug5805_3

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

tests/bugs/modalg_2/bug5805_4

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

tests/bugs/modalg_2/bug5805_5

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

tests/bugs/modalg_3/bug5805_6

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

tests/bugs/modalg_8/bug33113

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

tests/lowalgos/bnd/bug30292

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

tests/offset/bugs/bug26288

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

tests/offset/bugs/bug27913

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

tests/offset/bugs/bug30055

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

tests/offset/bugs/bug5806

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

tests/offset/shape/A2

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

tests/offset/shape/A3

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

tests/perf/modalg/bug26443_1

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