ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 13:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dont_read_occ_enames' into 'master'

Browse Source 
Faster OCC file loading

See merge request jschoeberl/netgen!280
This commit is contained in:
Joachim Schöberl 2019-10-21 13:45:11 +00:00
commit a2c04a196c
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libsrc/occ/occgeom.cpp
View File

@ -1310,6 +1310,10 @@ void STEP_GetEntityName(const TopoDS_Shape & theShape, STEPCAFControl_Reader * a
void LoadOCCInto(OCCGeometry* occgeo, const char* filename) void LoadOCCInto(OCCGeometry* occgeo, const char* filename)
{ {
static Timer timer_all("LoadOCC"); RegionTimer rtall(timer_all);
static Timer timer_readfile("LoadOCC-ReadFile");
static Timer timer_transfer("LoadOCC-Transfer");
static Timer timer_getnames("LoadOCC-get names");
// Initiate a dummy XCAF Application to handle the STEP XCAF Document // Initiate a dummy XCAF Application to handle the STEP XCAF Document
static Handle_XCAFApp_Application dummy_app = XCAFApp_Application::GetApplication(); static Handle_XCAFApp_Application dummy_app = XCAFApp_Application::GetApplication();
@ -1326,19 +1330,23 @@ void STEP_GetEntityName(const TopoDS_Shape & theShape, STEPCAFControl_Reader * a
} }
dummy_app->NewDocument ("STEP-XCAF",step_doc); dummy_app->NewDocument ("STEP-XCAF",step_doc);
timer_readfile.Start();
STEPCAFControl_Reader reader; STEPCAFControl_Reader reader;
// Enable transfer of colours // Enable transfer of colours
reader.SetColorMode(Standard_True); reader.SetColorMode(Standard_True);
reader.SetNameMode(Standard_True); reader.SetNameMode(Standard_True);
Standard_Integer stat = reader.ReadFile((char*)filename); Standard_Integer stat = reader.ReadFile((char*)filename);
timer_readfile.Stop();
timer_transfer.Start();
if(stat != IFSelect_RetDone) if(stat != IFSelect_RetDone)
{ {
throw NgException("Couldn't load OCC geometry"); throw NgException("Couldn't load OCC geometry");
} }
reader.Transfer(step_doc); reader.Transfer(step_doc);
timer_transfer.Stop();
// Read in the shape(s) and the colours present in the STEP File // Read in the shape(s) and the colours present in the STEP File
Handle_XCAFDoc_ShapeTool step_shape_contents = XCAFDoc_DocumentTool::ShapeTool(step_doc->Main()); Handle_XCAFDoc_ShapeTool step_shape_contents = XCAFDoc_DocumentTool::ShapeTool(step_doc->Main());
@ -1376,6 +1384,7 @@ void STEP_GetEntityName(const TopoDS_Shape & theShape, STEPCAFControl_Reader * a
occgeo->snames.Append(name); occgeo->snames.Append(name);
TopExp_Explorer exp0,exp1; TopExp_Explorer exp0,exp1;
timer_getnames.Start();
for (exp0.Init(occgeo->shape, TopAbs_FACE); exp0.More(); exp0.Next()) for (exp0.Init(occgeo->shape, TopAbs_FACE); exp0.More(); exp0.Next())
{ {
TopoDS_Face face = TopoDS::Face(exp0.Current()); TopoDS_Face face = TopoDS::Face(exp0.Current());
@ -1383,13 +1392,14 @@ void STEP_GetEntityName(const TopoDS_Shape & theShape, STEPCAFControl_Reader * a
if (name == string("")) if (name == string(""))
snprintf(name, 50, "bc_%zu", occgeo->fnames.Size()); snprintf(name, 50, "bc_%zu", occgeo->fnames.Size());
occgeo->fnames.Append(name); occgeo->fnames.Append(name);
for (exp1.Init(face, TopAbs_EDGE); exp1.More(); exp1.Next()) // for (exp1.Init(face, TopAbs_EDGE); exp1.More(); exp1.Next())
{ // {
TopoDS_Edge edge = TopoDS::Edge(exp1.Current()); // TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
STEP_GetEntityName(edge,&reader,name); // STEP_GetEntityName(edge,&reader,name);
occgeo->enames.Append(name); // occgeo->enames.Append(name);
} // }
} }
timer_getnames.Stop();
// Gerhard BEGIN // Gerhard BEGIN
// cout << "Solid Names: "<<endl; // cout << "Solid Names: "<<endl;
// for (int i=0;i<occgeo->snames.Size();i++) // for (int i=0;i<occgeo->snames.Size();i++)

2
libsrc/occ/occgeom.hpp
View File

@ -216,7 +216,7 @@ namespace netgen
TopTools_IndexedMapOfShape fmap, emap, vmap, somap, shmap, wmap; TopTools_IndexedMapOfShape fmap, emap, vmap, somap, shmap, wmap;
NgArray<bool> fsingular, esingular, vsingular; NgArray<bool> fsingular, esingular, vsingular;
Box<3> boundingbox; Box<3> boundingbox;
NgArray<string> fnames, enames, snames; NgArray<string> fnames, /*enames,*/ snames;
// Philippose - 29/01/2009 // Philippose - 29/01/2009
// OpenCascade XDE Support // OpenCascade XDE Support
// XCAF Handle to make the face colours available to the rest of // XCAF Handle to make the face colours available to the rest of