OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0025748: Parallel version of progress indicator

Browse Source 
Progress indication mechanism is refactored to support incrementing progress within multithreaded algorithms.

The class Message_ProgressIndicator is only an interface to the user application.
It accumulates the progress provided by progress scopes.
The counter is protected by mutex for thread-safety.

The new class Message_ProgressScope replacing Message_ProgressSentry should be used to advance the progress.
The scopes are nested to each other to reflect the nested nature of operations.
The new class Message_ProgressRange should be used to pass the progress to sub-scopes.

All OCCT algorithms involving progress indication have been updated to new API.

Improvements in Draw_ProgressIndicator:
- Separate console mode has been added in order to make possible to put the progress into std::cout instead
  or in addition to the draw interpreter, instead of trigger option "-tclOutput".
- Treatment of Ctrl-Break signal has been added.
  Now any operation can be aborted by Ctrl-C or Ctrl-Break keystroke.

Added new test case 'perf fclasses progr_par' for testing of parallel work of the progress.
This commit is contained in:
msv
2020-07-10 14:19:31 +03:00
committed by abv
parent 99289bed0a
commit 7e785937b3
271 changed files with 3701 additions and 3149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
View File

@@ -193,7 +193,7 @@ static Standard_Integer ReadGltf (Draw_Interpretor& theDI,
}
else
{
aReader.Perform (aFilePath, aProgress);
aReader.Perform (aFilePath, aProgress->Start());
if (isNoDoc)
{
DBRep::Set (aDestName.ToCString(), aReader.SingleShape());
@@ -315,7 +315,7 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI,
aWriter.SetForcedUVExport (toForceUVExport);
aWriter.ChangeCoordinateSystemConverter().SetInputLengthUnit (aSystemUnitFactor);
aWriter.ChangeCoordinateSystemConverter().SetInputCoordinateSystem (RWMesh_CoordinateSystem_Zup);
aWriter.Perform (aDoc, aFileInfo, aProgress);
aWriter.Perform (aDoc, aFileInfo, aProgress->Start());
return 0;
}
@@ -333,8 +333,8 @@ static Standard_Integer writestl
}
StlAPI_Writer aWriter;
aWriter.ASCIIMode() = isASCIIMode;
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator(di, 1);
Standard_Boolean isOK = aWriter.Write (aShape, argv[2], aProgress);
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (di);
Standard_Boolean isOK = aWriter.Write (aShape, argv[2], aProgress->Start());
if (!isOK)
di << "** Error **: Mesh writing has been failed.\n";
}
@@ -389,7 +389,7 @@ static Standard_Integer readstl(Draw_Interpretor& theDI,
{
// Read STL file to the triangulation.
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (theDI, 1);
Handle(Poly_Triangulation) aTriangulation = RWStl::ReadFile (aFilePath.ToCString(), aProgress);
Handle(Poly_Triangulation) aTriangulation = RWStl::ReadFile (aFilePath.ToCString(), aProgress->Start());
TopoDS_Face aFace;
BRep_Builder aB;
@@ -575,7 +575,7 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI,
aSimpleReader.SetSinglePrecision (isSinglePrecision);
aSimpleReader.SetCreateShapes (Standard_False);
aSimpleReader.SetTransformation (aReader.CoordinateSystemConverter());
aSimpleReader.Read (aFilePath.ToCString(), aProgress);
aSimpleReader.Read (aFilePath.ToCString(), aProgress->Start());
Handle(Poly_Triangulation) aTriangulation = aSimpleReader.GetTriangulation();
TopoDS_Face aFace;
@@ -596,7 +596,7 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI,
}
else
{
aReader.Perform (aFilePath, aProgress);
aReader.Perform (aFilePath, aProgress->Start());
if (isNoDoc)
{
DBRep::Set (aDestName.ToCString(), aReader.SingleShape());
@@ -762,7 +762,7 @@ static Standard_Integer createmesh
// Progress indicator
OSD_Path aFile( argv[2] );
Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (di, 1);
Handle(Poly_Triangulation) aSTLMesh = RWStl::ReadFile (aFile, aProgress);
Handle(Poly_Triangulation) aSTLMesh = RWStl::ReadFile (aFile, aProgress->Start());
di << "Reading OK...\n";
Handle( XSDRAWSTLVRML_DataSource ) aDS = new XSDRAWSTLVRML_DataSource( aSTLMesh );