From: cg246364 <clarisse.genrault@cea.fr>
Date: Fri, 12 Mar 2021 15:17:26 +0000 (+0100)
Subject: Fix to increase performance for import STEP
X-Git-Tag: V9_7_0a1~21
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=78e4238374cfb086116dd06683e2892e6631150f;p=modules%2Fshaper.git

Fix to increase performance for import STEP
---

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_STEPImportXCAF.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_STEPImportXCAF.cpp
index b77defd14..69797279c 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_STEPImportXCAF.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_STEPImportXCAF.cpp
@@ -94,8 +94,7 @@ std::shared_ptr<GeomAPI_Shape> readAttributes(STEPCAFControl_Reader &theReader,
   STEPControl_Reader aReader = theReader.ChangeReader();
 
   // BEGIN: reading materials of sub-shapes from file
-  if ( theIsMaterials )
-  {
+  if (theIsMaterials) {
     TopTools_IndexedMapOfShape anIndices;
     TopExp::MapShapes(ageom->impl<TopoDS_Shape>(), anIndices);
 
@@ -163,8 +162,7 @@ std::shared_ptr<GeomAPI_Shape> setgeom(const Handle(XCAFDoc_ShapeTool) &theShape
 
     TopoDS_Shape aShape = aCompound;
     // Check if any BRep entity has been read, there must be at least a vertex
-    if ( !TopExp_Explorer( aShape, TopAbs_VERTEX ).More() )
-    {
+    if (!TopExp_Explorer( aShape, TopAbs_VERTEX ).More()) {
       theError = "No geometrical data in the imported file.";
       std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
       aGeomShape->setImpl(new TopoDS_Shape());
@@ -215,7 +213,7 @@ void setShapeAttributes(const Handle(XCAFDoc_ShapeTool) &theShapeTool,
     TopoDS_Shape aShape = theShapeTool->GetShape(theLabel);
 
     std::shared_ptr<GeomAPI_Shape> aShapeGeom(new GeomAPI_Shape);
-    if (!theLoc.IsIdentity()){
+    if (!theLoc.IsIdentity()) {
         aShape.Move(theLoc);
     }
     aShapeGeom->setImpl(new TopoDS_Shape(aShape));
@@ -254,17 +252,17 @@ void setShapeAttributes(const Handle(XCAFDoc_ShapeTool) &theShapeTool,
       std::vector<int> aColRGB = {int(r*255),int(g*255),int(b*255)};
       theResultBody->addShapeColor(aShapeName, aColRGB);
     } else if (theColorTool->GetColor(theLabel, XCAFDoc_ColorCurv, aCol)) {
-     double aR = aCol.Red(), aG = aCol.Green(), aB = aCol.Blue();
-     std::vector<int> aColRGB = {int(aR*255),int(aG*255),int(aB*255)};
+      double aR = aCol.Red(), aG = aCol.Green(), aB = aCol.Blue();
+      std::vector<int> aColRGB = {int(aR*255),int(aG*255),int(aB*255)};
       theResultBody->addShapeColor(aShapeName, aColRGB);
     }
     // check explicit coloring of boundary entities
     if (aDim == 3) {
       TopExp_Explorer aXp2(aShape, TopAbs_FACE);
-      while(aXp2.More()) {
+      while (aXp2.More()) {
         if (theColorTool->GetColor(aXp2.Current(), XCAFDoc_ColorGen, aCol) ||
-           theColorTool->GetColor(aXp2.Current(), XCAFDoc_ColorSurf, aCol) ||
-           theColorTool->GetColor(aXp2.Current(), XCAFDoc_ColorCurv, aCol)) {
+          theColorTool->GetColor(aXp2.Current(), XCAFDoc_ColorSurf, aCol) ||
+          theColorTool->GetColor(aXp2.Current(), XCAFDoc_ColorCurv, aCol)) {
           double aR = aCol.Red(), aG = aCol.Green(), aB = aCol.Blue();
           TopoDS_Face aFace = TopoDS::Face(aXp2.Current());
           std::vector<int> aColRGB = {int(aR*255),int(aG*255),int(aB*255)};
@@ -280,23 +278,6 @@ void setShapeAttributes(const Handle(XCAFDoc_ShapeTool) &theShapeTool,
         aXp2.Next();
       }
     }
-    if (aDim == 2) {
-      TopExp_Explorer aXp1(aShape, TopAbs_EDGE);
-      while(aXp1.More()) {
-        if (theColorTool->GetColor(aXp1.Current(), XCAFDoc_ColorGen, aCol) ||
-           theColorTool->GetColor(aXp1.Current(), XCAFDoc_ColorSurf, aCol) ||
-           theColorTool->GetColor(aXp1.Current(), XCAFDoc_ColorCurv, aCol)) {
-           double aR = aCol.Red(), aG = aCol.Green(), aB = aCol.Blue();
-           std::vector<int> aColRGB = {int(aR*255),int(aG*255),int(aB*255)};
-           std::wstringstream aNameEdge;
-           aNameEdge << L"Edge_"<< aShapeName;
-           aShapeGeom->setImpl(new TopoDS_Shape(aXp1.Current() ));
-           theResultBody->addShapeColor(
-           theResultBody->addShapeName(aShapeGeom , aNameEdge.str()), aColRGB);
-        }
-        aXp1.Next();
-      }
-    }
   } else {
     if (!theShapeTool->IsReference(theLabel) ){
       TopoDS_Shape aShape = theShapeTool->GetShape(theLabel);