From 00e9052beec0845f7b313c41b8fb5a1287b4f9d8 Mon Sep 17 00:00:00 2001 From: akaftasev Date: Mon, 29 Mar 2021 19:15:54 +0300 Subject: [PATCH] 0031190: Modeling Algorithms - progress indication in GeomPlate is inconsistent Added ability to display progress indicator in plate commands Added tests --- src/BRepTest/BRepTest_FillingCommands.cxx | 28 ++++++++++--- src/GeomPlate/GeomPlate_BuildPlateSurface.cxx | 5 ++- src/Plate/Plate_Plate.cxx | 6 +-- src/math/math_Recipes.cxx | 2 +- tests/lowalgos/grids.list | 2 + tests/lowalgos/progress/A1 | 33 +++++++++++++++ tests/lowalgos/progress/A2 | 30 ++++++++++++++ tests/lowalgos/progress/A3 | 40 +++++++++++++++++++ tests/lowalgos/progress/A4 | 27 +++++++++++++ 9 files changed, 162 insertions(+), 11 deletions(-) create mode 100644 tests/lowalgos/progress/A1 create mode 100644 tests/lowalgos/progress/A2 create mode 100644 tests/lowalgos/progress/A3 create mode 100644 tests/lowalgos/progress/A4 diff --git a/src/BRepTest/BRepTest_FillingCommands.cxx b/src/BRepTest/BRepTest_FillingCommands.cxx index 99f424d24e..0bd777772d 100644 --- a/src/BRepTest/BRepTest_FillingCommands.cxx +++ b/src/BRepTest/BRepTest_FillingCommands.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -167,8 +168,13 @@ static Standard_Integer plate (Draw_Interpretor & di,Standard_Integer n,const ch NbPtsCur->Value(i)); Henri.Add(Cont); } - - Henri.Perform(); + Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator(di, 1); + Henri.Perform(aProgress->Start()); + if (aProgress->UserBreak()) + { + di << "Error: UserBreak\n"; + return 0; + } Standard_Real ErrG0 = 1.1*Henri.G0Error(); //std::cout<<" dist. max = "<Start()); + if (aProgress->UserBreak()) + { + di << "Error: UserBreak\n"; + return 0; + } Standard_Real dmax = Henri.G0Error(), anmax = Henri.G1Error(); diff --git a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx index a135f7b2b9..7e5a5d8786 100644 --- a/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx +++ b/src/GeomPlate/GeomPlate_BuildPlateSurface.cxx @@ -470,7 +470,7 @@ void GeomPlate_BuildPlateSurface::Perform(const Message_ProgressRange& theProgre //====================================================================== // Initial Surface //====================================================================== - Message_ProgressScope aPS(theProgress, NULL, 100, Standard_True); + Message_ProgressScope aPS(theProgress, "Calculating the surface filled", 100, Standard_True); if (!mySurfInitIsGive) { ComputeSurfInit (aPS.Next(10)); @@ -1716,7 +1716,8 @@ void GeomPlate_BuildPlateSurface::ComputeSurfInit(const Message_ProgressRange& t //==================================================================== // Construction of the surface //==================================================================== - myPlate.SolveTI(2, ComputeAnisotropie(), theProgress); + Message_ProgressScope aPS(theProgress, "ComputeSurfInit", 1); + myPlate.SolveTI(2, ComputeAnisotropie(), aPS.Next()); if (theProgress.UserBreak()) { return; diff --git a/src/Plate/Plate_Plate.cxx b/src/Plate/Plate_Plate.cxx index 46f8ef0d27..23f6c1191b 100644 --- a/src/Plate/Plate_Plate.cxx +++ b/src/Plate/Plate_Plate.cxx @@ -345,7 +345,7 @@ void Plate_Plate::SolveTI1(const Standard_Integer IterationNumber, Standard_Real pivot_max = 1.e-12; OK = Standard_True; - Message_ProgressScope aScope (theProgress, NULL, 10); + Message_ProgressScope aScope (theProgress, "Plate_Plate::SolveTI1()", 10); math_Gauss algo_gauss(mat,pivot_max, aScope.Next (7)); if (aScope.UserBreak()) @@ -459,7 +459,7 @@ void Plate_Plate::SolveTI2(const Standard_Integer IterationNumber, Standard_Real pivot_max = 1.e-12; OK = Standard_True; // ************ JHH - Message_ProgressScope aScope (theProgress, NULL, 10); + Message_ProgressScope aScope (theProgress, "Plate_Plate::SolveTI2()", 10); math_Gauss algo_gauss(mat,pivot_max, aScope.Next (7)); if (aScope.UserBreak()) @@ -733,7 +733,7 @@ void Plate_Plate::SolveTI3(const Standard_Integer IterationNumber, Standard_Real pivot_max = 1.e-12; OK = Standard_True; // ************ JHH - Message_ProgressScope aScope (theProgress, NULL, 10); + Message_ProgressScope aScope (theProgress, "Plate_Plate::SolveTI3()", 10); math_Gauss algo_gauss(mat,pivot_max, aScope.Next (7)); if (aScope.UserBreak()) diff --git a/src/math/math_Recipes.cxx b/src/math/math_Recipes.cxx index 31168f47e6..165d20fe9f 100644 --- a/src/math/math_Recipes.cxx +++ b/src/math/math_Recipes.cxx @@ -185,7 +185,7 @@ Standard_Integer LU_Decompose(math_Matrix& a, Standard_Integer n = a.RowNumber(); d = 1.0; - Message_ProgressScope aPS(theProgress, "", n); + Message_ProgressScope aPS(theProgress, "math_Gauss LU_Decompose", n); for(i = 1; i <= n; i++) { big = 0.0; diff --git a/tests/lowalgos/grids.list b/tests/lowalgos/grids.list index 7aa5c18d21..0ebc6f8e35 100644 --- a/tests/lowalgos/grids.list +++ b/tests/lowalgos/grids.list @@ -7,3 +7,5 @@ 007 intss 008 classifier 009 bvh +010 progress + diff --git a/tests/lowalgos/progress/A1 b/tests/lowalgos/progress/A1 new file mode 100644 index 0000000000..aaa21658ef --- /dev/null +++ b/tests/lowalgos/progress/A1 @@ -0,0 +1,33 @@ +puts "========" +puts "0031190: Modeling Algorithms - progress indication in GeomPlate is inconsistent" +puts "========" + +plane p +trim p p -1 3 -1 3 +mkface p p + +beziercurve c1 3 0 0 0 1 0 1 2 0 0 +mkedge e1 c1 +tcopy e1 e2 +tcopy e1 e3 + +ttranslate e2 0 2 0 +trotate e3 0 0 0 0 0 1 90 +tcopy e3 e4 +ttranslate e4 2 0 0 + +# Configurate XProgress +XProgress +t + +# create the surface +set output [gplate r1 4 0 p e1 0 e2 0 e3 0 e4 0] + +# Test data +set ctr {"0%" "Calculating the surface filled" "Plate_Plate::SolveTI1()" "math_Gauss LU_Decompose" "100%" } + +foreach data ${ctr} { + if ![regexp $data $output] { + puts "Error: gplate command: Mismatch data on '$data'" + break + } +} diff --git a/tests/lowalgos/progress/A2 b/tests/lowalgos/progress/A2 new file mode 100644 index 0000000000..2030079c4c --- /dev/null +++ b/tests/lowalgos/progress/A2 @@ -0,0 +1,30 @@ +puts "========" +puts "0031190: Modeling Algorithms - progress indication in GeomPlate is inconsistent" +puts "========" + +beziercurve c1 3 0 0 0 1 0 1 2 0 0 +mkedge e1 c1 +tcopy e1 e2 +ttranslate e2 0 2 0 + +beziercurve c2 3 0 0 0 0 1 2 0 2 0 +mkedge e3 c2 +tcopy e3 e4 +ttranslate e4 2 0 0 + +# Configurate XProgress +XProgress +t + +# create the surface +set output [gplate r1 4 0 e1 0 e2 0 e3 0 e4 0] + +# Test data +set ctr {"0%" "Calculating the surface filled" "ComputeSurfInit" + "Plate_Plate::SolveTI1()" "math_Gauss LU_Decompose" "100%" } + +foreach data ${ctr} { + if ![regexp $data $output] { + puts "Error: gplate command: Mismatch data on '$data'" + break + } +} diff --git a/tests/lowalgos/progress/A3 b/tests/lowalgos/progress/A3 new file mode 100644 index 0000000000..e38ea895d5 --- /dev/null +++ b/tests/lowalgos/progress/A3 @@ -0,0 +1,40 @@ +puts "========" +puts "0031190: Modeling Algorithms - progress indication in GeomPlate is inconsistent" +puts "========" + +# Generate control points +set points {} +set i 0 +for {set j 0} {$j < 300} {incr j; incr i} { + point p$i $j 0 0 + lappend points p$i +} +for {set j 1} {$j < 300} {incr j; incr i} { + point p$i 0 $j 0 + lappend points p$i +} +for {set j 0} {$j < 300} {incr j; incr i} { + point p$i 300 $j 0 + lappend points p$i +} + +for {set j 0} {$j < 301} {incr j; incr i} { + point p$i $j 300 0 + lappend points p$i +} + +# Configurate XProgress +XProgress +t + +# create the surface +set output [eval gplate res 0 [llength $points] $points] + +# Test data +set ctr {"0%" "Calculating the surface filled" "Plate_Plate::SolveTI1()" "math_Gauss LU_Decompose" "100%" } + +foreach data ${ctr} { + if ![regexp $data $output] { + puts "Error: gplate command: Mismatch data on '$data'" + break + } +} diff --git a/tests/lowalgos/progress/A4 b/tests/lowalgos/progress/A4 new file mode 100644 index 0000000000..b30a964830 --- /dev/null +++ b/tests/lowalgos/progress/A4 @@ -0,0 +1,27 @@ +puts "========" +puts "0031190: Modeling Algorithms - progress indication in GeomPlate is inconsistent" +puts "========" + +# Generate control points +set n 100 +set l {} +for {set i 0} {$i < $n} {incr i} { + point p$i [dval sin(2.*pi*$i/$n)] [dval cos(2.*pi*$i/$n)] [expr abs(1-2.*$i/$n)] + lappend l p$i +} + +# Configurate XProgress +XProgress +t + +# create the surface +set output [eval gplate r 0 [llength $l] $l] + +# Test data +set ctr {"0%" "Calculating the surface filled" "Plate_Plate::SolveTI1()" "math_Gauss LU_Decompose" "100%" } + +foreach data ${ctr} { + if ![regexp $data $output] { + puts "Error: gplate command: Mismatch data on '$data'" + break + } +}