Skip to content
Snippets Groups Projects
Commit edd4f1f9 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

cleanup

parent 59c8dd78
No related branches found
No related tags found
No related merge requests found
......@@ -415,7 +415,7 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...)
#if defined(HAVE_FLTK)
if(FlGui::available() && _verbosity > 4){
FlGui::instance()->check();
FlGui::instance()->setProgress(str, n, N);
FlGui::instance()->setProgress(str, n, 0, N);
}
#endif
......@@ -434,7 +434,7 @@ void Msg::ProgressMeter(int n, int N, const char *fmt, ...)
#if defined(HAVE_FLTK)
if(FlGui::available() && _verbosity > 4){
FlGui::instance()->check();
FlGui::instance()->setProgress("", 0, N);
FlGui::instance()->setProgress("", 0, 0, N);
}
#endif
......
......@@ -810,15 +810,15 @@ void FlGui::setStatus(const char *msg, int num)
}
}
void FlGui::setProgress(const char *msg, int n, int N)
void FlGui::setProgress(const char *msg, double val, double min, double max)
{
for(unsigned int i = 0; i < FlGui::instance()->graph.size(); i++){
if(FlGui::instance()->graph[i]->label[1]->minimum() != 0)
FlGui::instance()->graph[i]->label[1]->minimum(0);
if(FlGui::instance()->graph[i]->label[1]->maximum() != N)
FlGui::instance()->graph[i]->label[1]->maximum(N);
if(FlGui::instance()->graph[i]->label[1]->value() != n)
FlGui::instance()->graph[i]->label[1]->value(n);
if(FlGui::instance()->graph[i]->label[1]->value() != val)
FlGui::instance()->graph[i]->label[1]->value(val);
if(FlGui::instance()->graph[i]->label[1]->minimum() != min)
FlGui::instance()->graph[i]->label[1]->minimum(min);
if(FlGui::instance()->graph[i]->label[1]->maximum() != max)
FlGui::instance()->graph[i]->label[1]->maximum(max);
}
setStatus(msg, 1);
}
......
......@@ -109,7 +109,7 @@ class FlGui{
// display status message
void setStatus(const char *msg, int num);
// display status message and update progress bar
void setProgress(const char *msg, int n, int N);
void setProgress(const char *msg, double val, double min, double max);
// create the window for physical context dependant definitions
void callForSolverPlugin(int dim);
// add line in message console(s)
......
......@@ -278,7 +278,8 @@ bool onelab::localNetworkClient::run()
else if(type == "number"){
onelab::number p; p.fromChar(message); set(p);
if(p.getName() == getName() + "/Progress")
FlGui::instance()->setProgress(p.getLabel().c_str(), p.getValue(), p.getMax());
FlGui::instance()->setProgress(p.getLabel().c_str(), p.getValue(),
p.getMin(), p.getMax());
}
else if(type == "string"){
onelab::string p; p.fromChar(message); set(p);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment