diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h index 9c762e393ed4524a6e051cbde66e6b89b64ca295..46857b35d0e7b036ee5e414d059940006bac9a8b 100644 --- a/Common/DefaultOptions.h +++ b/Common/DefaultOptions.h @@ -621,7 +621,7 @@ StringXNumber GeneralOptions_Number[] = { { F|O, "VectorType" , opt_general_vector_type , 4 , "Default vector display type (for normals, etc.)" }, - { F|O, "Verbosity" , opt_general_verbosity , 4. , + { F|O, "Verbosity" , opt_general_verbosity , 5. , "Level of information printed during processing (0=no information)" }, { F|S, "VisibilityPositionX" , opt_general_visibility_position0 , 650. , "Horizontal position (in pixels) of the upper left corner of the visibility " diff --git a/Common/GmshMessage.cpp b/Common/GmshMessage.cpp index 8b2bc5f6ec4f8df326dda4fcb7c9a1d764172a76..c863dab01438518e47c6e468527ecbf182bdb95b 100644 --- a/Common/GmshMessage.cpp +++ b/Common/GmshMessage.cpp @@ -40,7 +40,7 @@ int Msg::_commRank = 0; int Msg::_commSize = 1; -int Msg::_verbosity = 4; +int Msg::_verbosity = 5; int Msg::_progressMeterStep = 10; int Msg::_progressMeterCurrent = 0; std::map<std::string, double> Msg::_timers; @@ -258,7 +258,7 @@ void Msg::Warning(const char *fmt, ...) void Msg::Info(const char *fmt, ...) { - if(_commRank || _verbosity < 3) return; + if(_commRank || _verbosity < 4) return; char str[1024]; va_list args; @@ -333,7 +333,7 @@ void Msg::Direct(int level, const char *fmt, ...) void Msg::StatusBar(int num, bool log, const char *fmt, ...) { - if(_commRank || _verbosity < 3) return; + if(_commRank || _verbosity < 4) return; if(num < 1 || num > 3) return; char str[1024]; @@ -348,7 +348,7 @@ void Msg::StatusBar(int num, bool log, const char *fmt, ...) #if defined(HAVE_FLTK) if(FlGui::available()){ if(log) FlGui::instance()->check(); - if(!log || num != 2 || _verbosity > 3) + if(!log || num != 2 || _verbosity > 4) FlGui::instance()->setStatus(str, num - 1); if(log){ std::string tmp = std::string("Info : ") + str; @@ -394,7 +394,7 @@ void Msg::Debug(const char *fmt, ...) void Msg::ProgressMeter(int n, int N, const char *fmt, ...) { - if(_commRank || _verbosity < 3) return; + if(_commRank || _verbosity < 4) return; double percent = 100. * (double)n/(double)N; @@ -415,7 +415,7 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...) #if defined(HAVE_FLTK) if(FlGui::available()){ - if(_verbosity > 3) FlGui::instance()->setStatus(str, 1); + if(_verbosity > 4) FlGui::instance()->setStatus(str, 1); FlGui::instance()->check(); } #endif @@ -434,7 +434,7 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...) #if defined(HAVE_FLTK) if(FlGui::available()){ - if(_verbosity > 3) FlGui::instance()->setStatus("", 1); + if(_verbosity > 4) FlGui::instance()->setStatus("", 1); } #endif diff --git a/Common/GmshMessage.h b/Common/GmshMessage.h index e93efa1813a6da1d4bd64911a509c536e5f66547..ff36da14f10309a443358e7ecdf9d2a17f773458 100644 --- a/Common/GmshMessage.h +++ b/Common/GmshMessage.h @@ -28,7 +28,7 @@ class Msg { // current cpu number and total number of cpus static int _commRank, _commSize; // verbosity level (0: silent except fatal errors, 1: +errors, 2: - // +warnings, 3: +info except status bar, 4: normal, 99: debug) + // +warnings, 3: +direct, 4: +info except status bar, 5: normal, 99: debug) static int _verbosity; // step (in %) of the progress meter and current progress % static int _progressMeterStep, _progressMeterCurrent;