OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025116: BRepTools - do not force Message_ProgressIndicator updates on each minor iteration

Browse Source
This commit is contained in:
kgv 2014-07-31 16:12:45 +04:00 committed by apv
parent 2d7b28ac98
commit 616d8d0a78
6 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/BRepTools/BRepTools_ShapeSet.cxx
View File

@ -1238,11 +1238,7 @@ void BRepTools_ShapeSet::WritePolygonOnTriangulation(Standard_OStream& OS,
Handle(Poly_PolygonOnTriangulation) Poly;
Handle(TColStd_HArray1OfReal) Param;
for (i=1; i<=nbpOntri && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
Poly = Handle(Poly_PolygonOnTriangulation)::DownCast(myNodes(i));
const TColStd_Array1OfInteger& Nodes = Poly->Nodes();
if (!Compact) {
@ -1305,9 +1301,6 @@ void BRepTools_ShapeSet::ReadPolygonOnTriangulation(Standard_IStream& IS)
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "Polygons On Triangulation", 0, nbpol, 1);
for (i=1; i<=nbpol&& PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
IS >> nbnodes;
TColStd_Array1OfInteger Nodes(1, nbnodes);
for (j = 1; j <= nbnodes; j++) {
@ -1365,9 +1358,6 @@ void BRepTools_ShapeSet::WritePolygon3D(Standard_OStream& OS,
Handle(Poly_Polygon3D) P;
for (i = 1; i <= nbpol && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
P = Handle(Poly_Polygon3D)::DownCast(myPolygons3D(i));
if (Compact) {
OS << P->NbNodes() << " ";
@ -1443,9 +1433,6 @@ void BRepTools_ShapeSet::ReadPolygon3D(Standard_IStream& IS)
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "3D Polygons", 0, nbpol, 1);
for (i=1; i<=nbpol && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
IS >> nbnodes;
IS >> hasparameters;
TColgp_Array1OfPnt Nodes(1, nbnodes);
@ -1493,8 +1480,6 @@ void BRepTools_ShapeSet::WriteTriangulation(Standard_OStream& OS,
Handle(Poly_Triangulation) T;
for (i = 1; i <= nbtri && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
T = Handle(Poly_Triangulation)::DownCast(myTriangulations(i));
if (Compact) {
@ -1599,8 +1584,6 @@ void BRepTools_ShapeSet::ReadTriangulation(Standard_IStream& IS)
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "Triangulations", 0, nbtri, 1);
for (i=1; i<=nbtri && PS.More();i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
IS >> nbNodes >> nbTriangles >> hasUV;
IS >> d;
@ -1636,5 +1619,3 @@ void BRepTools_ShapeSet::ReadTriangulation(Standard_IStream& IS)
myTriangulations.Add(T);
}
}

8
src/GeomTools/GeomTools_Curve2dSet.cxx
View File

@ -504,13 +504,9 @@ void GeomTools_Curve2dSet::Write(Standard_OStream& OS)const
//OCC19559
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "2D Curves", 0, nbsurf, 1);
for (i = 1; i <= nbsurf && PS.More(); i++, PS.Next()) {
if ( !myProgress.IsNull() )
progress->Show();
PrintCurve2d(Handle(Geom2d_Curve)::DownCast(myMap(i)),OS,Standard_True);
}
OS.precision(prec);
}
@ -851,11 +847,7 @@ void GeomTools_Curve2dSet::Read(Standard_IStream& IS)
//OCC19559
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "2D Curves", 0, nbcurve, 1);
for (i = 1; i <= nbcurve && PS.More(); i++, PS.Next()) {
if ( !myProgress.IsNull() )
progress->Show();
GeomTools_Curve2dSet::ReadCurve2d(IS,C);
myMap.Add(C);
}

8
src/GeomTools/GeomTools_CurveSet.cxx
View File

@ -521,14 +521,9 @@ void GeomTools_CurveSet::Write(Standard_OStream& OS)const
//OCC19559
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "3D Curves", 0, nbcurve, 1);
for (i = 1; i <= nbcurve && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
PrintCurve(Handle(Geom_Curve)::DownCast(myMap(i)),OS,Standard_True);
}
OS.precision(prec);
}
@ -872,9 +867,6 @@ void GeomTools_CurveSet::Read(Standard_IStream& IS)
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "3D Curves", 0, nbcurve, 1);
for (i = 1; i <= nbcurve && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
GeomTools_CurveSet::ReadCurve(IS,C);
myMap.Add(C);
}

8
src/GeomTools/GeomTools_SurfaceSet.cxx
View File

@ -641,14 +641,9 @@ void GeomTools_SurfaceSet::Write(Standard_OStream& OS)const
//OCC19559
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "Surfaces", 0, nbsurf, 1);
for (i = 1; i <= nbsurf && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
PrintSurface(Handle(Geom_Surface)::DownCast(myMap(i)),OS,Standard_True);
}
OS.precision(prec);
}
@ -1062,9 +1057,6 @@ void GeomTools_SurfaceSet::Read(Standard_IStream& IS)
Handle(Message_ProgressIndicator) progress = GetProgress();
Message_ProgressSentry PS(progress, "Surfaces", 0, nbsurf, 1);
for (i = 1; i <= nbsurf && PS.More(); i++, PS.Next()) {
if ( !progress.IsNull() )
progress->Show();
GeomTools_SurfaceSet::ReadSurface(IS,S);
myMap.Add(S);
}

7
src/TopTools/TopTools_LocationSet.cxx
View File

@ -180,11 +180,7 @@ void TopTools_LocationSet::Write(Standard_OStream& OS) const
//OCC19559
Message_ProgressSentry PS(GetProgress(), "Locations", 0, nbLoc, 1);
for (i = 1; i <= nbLoc && PS.More(); i++, PS.Next()) {
if ( !GetProgress().IsNull() )
GetProgress()->Show();
TopLoc_Location L = myMap(i);
@ -261,9 +257,6 @@ void TopTools_LocationSet::Read(Standard_IStream& IS)
//OCC19559
Message_ProgressSentry PS(GetProgress(), "Locations", 0, nbLoc, 1);
for (i = 1; i <= nbLoc&& PS.More(); i++, PS.Next()) {
if ( !GetProgress().IsNull() )
GetProgress()->Show();
Standard_Integer typLoc;
IS >> typLoc;

6
src/TopTools/TopTools_ShapeSet.cxx
View File

@ -499,11 +499,7 @@ void TopTools_ShapeSet::Write(Standard_OStream& OS)
if ( !myProgress.IsNull() )
myProgress->NewScope ( 15, "Shapes" );
Message_ProgressSentry PS(myProgress, "Shapes", 0, nbShapes, 1);
for (i = 1; i <= nbShapes && PS.More(); i++, PS.Next()) {
if ( !myProgress.IsNull() )
myProgress->Show();
const TopoDS_Shape& S = myShapes(i);
// Type
@ -687,8 +683,6 @@ void TopTools_ShapeSet::Read(Standard_IStream& IS)
myProgress->NewScope ( 15, "Shapes" );
Message_ProgressSentry PS(myProgress, "Shapes", 0, nbShapes, 1);
for (i = 1; i <= nbShapes && PS.More(); i++, PS.Next() ) {
if ( !myProgress.IsNull() )
myProgress->Show();
TopoDS_Shape S;
//Read type and create empty shape.