mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-04 18:06:22 +03:00
7e785937b3
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.
27 lines
721 B
Plaintext
27 lines
721 B
Plaintext
puts "# ============"
|
|
puts "# 0028478: Scope Names Are Swallowed in Message_ProgressSentry Constructors"
|
|
puts "# ============"
|
|
puts ""
|
|
puts "# Test output of progress indicator in text mode"
|
|
|
|
pload QAcommands
|
|
|
|
XProgress +t
|
|
|
|
set out [OCC28478 3 2]
|
|
|
|
set expected {
|
|
{Progress: 0%}
|
|
{Progress: 17% Outer: 1 / 3 Inner: 1 / 2}
|
|
{Progress: 33% Outer: 1 / 3 Inner: 2 / 2}
|
|
{Progress: 50% Outer: 2 / 3 Inner: 1 / 2}
|
|
{Progress: 67% Outer: 2 / 3 Inner: 2 / 2}
|
|
{Progress: 83% Outer: 3 / 3 Inner: 1 / 2}
|
|
{Progress: 100% Outer: 3 / 3 Inner: 2 / 2}
|
|
}
|
|
|
|
if { [string compare [string trim $out] [join $expected "\n"]] } {
|
|
puts "Error: output (see above) does not match expected one:"
|
|
puts "[join $expected "\n"]"
|
|
puts ""
|
|
} |