Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
edd4f1f9
Commit
edd4f1f9
authored
13 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
cleanup
parent
59c8dd78
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Common/GmshMessage.cpp
+2
-2
2 additions, 2 deletions
Common/GmshMessage.cpp
Fltk/FlGui.cpp
+7
-7
7 additions, 7 deletions
Fltk/FlGui.cpp
Fltk/FlGui.h
+1
-1
1 addition, 1 deletion
Fltk/FlGui.h
Fltk/onelabWindow.cpp
+2
-1
2 additions, 1 deletion
Fltk/onelabWindow.cpp
with
12 additions
and
11 deletions
Common/GmshMessage.cpp
+
2
−
2
View file @
edd4f1f9
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Fltk/FlGui.cpp
+
7
−
7
View file @
edd4f1f9
...
...
@@ -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
]
->
m
ax
imum
()
!=
N
)
FlGui
::
instance
()
->
graph
[
i
]
->
label
[
1
]
->
m
ax
imum
(
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
]
->
m
in
imum
()
!=
min
)
FlGui
::
instance
()
->
graph
[
i
]
->
label
[
1
]
->
m
in
imum
(
min
);
if
(
FlGui
::
instance
()
->
graph
[
i
]
->
label
[
1
]
->
maximum
()
!=
max
)
FlGui
::
instance
()
->
graph
[
i
]
->
label
[
1
]
->
maximum
(
max
);
}
setStatus
(
msg
,
1
);
}
...
...
This diff is collapsed.
Click to expand it.
Fltk/FlGui.h
+
1
−
1
View file @
edd4f1f9
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Fltk/onelabWindow.cpp
+
2
−
1
View file @
edd4f1f9
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment