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
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
e9bfb7ae
Commit
e9bfb7ae
authored
13 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
onelab work
parent
b1e093e2
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Fltk/FlGui.cpp
+1
-1
1 addition, 1 deletion
Fltk/FlGui.cpp
Fltk/onelabWindow.cpp
+22
-15
22 additions, 15 deletions
Fltk/onelabWindow.cpp
Fltk/onelabWindow.h
+1
-0
1 addition, 0 deletions
Fltk/onelabWindow.h
with
24 additions
and
16 deletions
Fltk/FlGui.cpp
+
1
−
1
View file @
e9bfb7ae
...
@@ -281,7 +281,7 @@ FlGui::FlGui(int argc, char **argv) : _openedThroughMacFinder(false)
...
@@ -281,7 +281,7 @@ FlGui::FlGui(int argc, char **argv) : _openedThroughMacFinder(false)
meshContext
=
new
meshContextWindow
(
CTX
::
instance
()
->
deltaFontSize
);
meshContext
=
new
meshContextWindow
(
CTX
::
instance
()
->
deltaFontSize
);
about
=
new
aboutWindow
();
about
=
new
aboutWindow
();
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
#if (FL_MAJOR_VERSION == 1) && (FL_MINOR_VERSION == 3)
onelab
=
new
onelabWindow
();
onelab
=
new
onelabWindow
(
CTX
::
instance
()
->
deltaFontSize
);
#endif
#endif
// init solver plugin stuff
// init solver plugin stuff
...
...
This diff is collapsed.
Click to expand it.
Fltk/onelabWindow.cpp
+
22
−
15
View file @
e9bfb7ae
...
@@ -324,7 +324,7 @@ static void initializeLoop(std::string level)
...
@@ -324,7 +324,7 @@ static void initializeLoop(std::string level)
std
::
vector
<
onelab
::
number
>
numbers
;
std
::
vector
<
onelab
::
number
>
numbers
;
onelab
::
server
::
instance
()
->
get
(
numbers
);
onelab
::
server
::
instance
()
->
get
(
numbers
);
for
(
unsigned
int
i
=
0
;
i
<
numbers
.
size
();
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
numbers
.
size
();
i
++
){
if
(
numbers
[
i
].
getAttribute
(
"
l
oop"
)
==
level
){
if
(
numbers
[
i
].
getAttribute
(
"
L
oop"
)
==
level
){
if
(
numbers
[
i
].
getChoices
().
size
()
>
1
){
if
(
numbers
[
i
].
getChoices
().
size
()
>
1
){
numbers
[
i
].
setValue
(
numbers
[
i
].
getChoices
()[
0
]);
numbers
[
i
].
setValue
(
numbers
[
i
].
getChoices
()[
0
]);
onelab
::
server
::
instance
()
->
set
(
numbers
[
i
]);
onelab
::
server
::
instance
()
->
set
(
numbers
[
i
]);
...
@@ -351,7 +351,7 @@ static bool incrementLoop(std::string level)
...
@@ -351,7 +351,7 @@ static bool incrementLoop(std::string level)
std
::
vector
<
onelab
::
number
>
numbers
;
std
::
vector
<
onelab
::
number
>
numbers
;
onelab
::
server
::
instance
()
->
get
(
numbers
);
onelab
::
server
::
instance
()
->
get
(
numbers
);
for
(
unsigned
int
i
=
0
;
i
<
numbers
.
size
();
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
numbers
.
size
();
i
++
){
if
(
numbers
[
i
].
getAttribute
(
"
l
oop"
)
==
level
){
if
(
numbers
[
i
].
getAttribute
(
"
L
oop"
)
==
level
){
loop
=
true
;
loop
=
true
;
if
(
numbers
[
i
].
getChoices
().
size
()
>
1
){
if
(
numbers
[
i
].
getChoices
().
size
()
>
1
){
// FIXME should store loopVariable attribute in the parameter
// FIXME should store loopVariable attribute in the parameter
...
@@ -454,11 +454,11 @@ static void updateOnelabGraph(std::string num)
...
@@ -454,11 +454,11 @@ static void updateOnelabGraph(std::string num)
std
::
vector
<
onelab
::
number
>
numbers
;
std
::
vector
<
onelab
::
number
>
numbers
;
onelab
::
server
::
instance
()
->
get
(
numbers
);
onelab
::
server
::
instance
()
->
get
(
numbers
);
for
(
unsigned
int
i
=
0
;
i
<
numbers
.
size
();
i
++
){
for
(
unsigned
int
i
=
0
;
i
<
numbers
.
size
();
i
++
){
if
(
numbers
[
i
].
getAttribute
(
"
g
raph
_x
"
)
==
num
){
if
(
numbers
[
i
].
getAttribute
(
"
G
raph
X
"
)
==
num
){
x
=
getRange
(
numbers
[
i
]);
x
=
getRange
(
numbers
[
i
]);
xName
=
getShortName
(
numbers
[
i
].
getName
(),
numbers
[
i
].
getShortHelp
());
xName
=
getShortName
(
numbers
[
i
].
getName
(),
numbers
[
i
].
getShortHelp
());
}
}
if
(
numbers
[
i
].
getAttribute
(
"
g
raph
_y
"
)
==
num
){
if
(
numbers
[
i
].
getAttribute
(
"
G
raph
Y
"
)
==
num
){
y
=
getRange
(
numbers
[
i
]);
y
=
getRange
(
numbers
[
i
]);
yName
=
getShortName
(
numbers
[
i
].
getName
(),
numbers
[
i
].
getShortHelp
());
yName
=
getShortName
(
numbers
[
i
].
getName
(),
numbers
[
i
].
getShortHelp
());
}
}
...
@@ -570,6 +570,7 @@ void onelab_cb(Fl_Widget *w, void *data)
...
@@ -570,6 +570,7 @@ void onelab_cb(Fl_Widget *w, void *data)
}
}
}
}
if
(
action
==
"compute"
)
FlGui
::
instance
()
->
onelab
->
checkForErrors
(
"Gmsh"
);
FlGui
::
instance
()
->
onelab
->
checkForErrors
(
"Gmsh"
);
if
(
FlGui
::
instance
()
->
onelab
->
stop
())
break
;
if
(
FlGui
::
instance
()
->
onelab
->
stop
())
break
;
...
@@ -596,6 +597,7 @@ void onelab_cb(Fl_Widget *w, void *data)
...
@@ -596,6 +597,7 @@ void onelab_cb(Fl_Widget *w, void *data)
c
->
kill
();
c
->
kill
();
}
}
if
(
action
==
"compute"
)
FlGui
::
instance
()
->
onelab
->
checkForErrors
(
c
->
getName
());
FlGui
::
instance
()
->
onelab
->
checkForErrors
(
c
->
getName
());
if
(
FlGui
::
instance
()
->
onelab
->
stop
())
break
;
if
(
FlGui
::
instance
()
->
onelab
->
stop
())
break
;
}
}
...
@@ -636,9 +638,9 @@ static void onelab_input_range_cb(Fl_Widget *w, void *data)
...
@@ -636,9 +638,9 @@ static void onelab_input_range_cb(Fl_Widget *w, void *data)
numbers
[
0
].
setMax
(
o
->
maximum
());
numbers
[
0
].
setMax
(
o
->
maximum
());
numbers
[
0
].
setStep
(
o
->
step
());
numbers
[
0
].
setStep
(
o
->
step
());
numbers
[
0
].
setChoices
(
o
->
choices
());
numbers
[
0
].
setChoices
(
o
->
choices
());
numbers
[
0
].
setAttribute
(
"
l
oop"
,
o
->
loop
());
numbers
[
0
].
setAttribute
(
"
L
oop"
,
o
->
loop
());
numbers
[
0
].
setAttribute
(
"
g
raph
_x
"
,
o
->
graph_x
());
numbers
[
0
].
setAttribute
(
"
G
raph
X
"
,
o
->
graph_x
());
numbers
[
0
].
setAttribute
(
"
g
raph
_y
"
,
o
->
graph_y
());
numbers
[
0
].
setAttribute
(
"
G
raph
Y
"
,
o
->
graph_y
());
onelab
::
server
::
instance
()
->
set
(
numbers
[
0
]);
onelab
::
server
::
instance
()
->
set
(
numbers
[
0
]);
updateOnelabGraphs
();
updateOnelabGraphs
();
}
}
...
@@ -700,9 +702,10 @@ static void onelab_dump_cb(Fl_Widget *w, void *data)
...
@@ -700,9 +702,10 @@ static void onelab_dump_cb(Fl_Widget *w, void *data)
printf
(
"ONELAB dump:
\n
%s
\n
"
,
onelab
::
server
::
instance
()
->
toChar
().
c_str
());
printf
(
"ONELAB dump:
\n
%s
\n
"
,
onelab
::
server
::
instance
()
->
toChar
().
c_str
());
}
}
onelabWindow
::
onelabWindow
(
int
deltaFontSize
)
:
_stop
(
false
)
onelabWindow
::
onelabWindow
(
int
deltaFontSize
)
:
_deltaFontSize
(
deltaFontSize
),
_stop
(
false
)
{
{
FL_NORMAL_SIZE
-=
deltaFontSize
;
FL_NORMAL_SIZE
-=
_
deltaFontSize
;
int
width
=
29
*
FL_NORMAL_SIZE
;
int
width
=
29
*
FL_NORMAL_SIZE
;
int
height
=
15
*
BH
+
3
*
WB
;
int
height
=
15
*
BH
+
3
*
WB
;
...
@@ -739,11 +742,13 @@ onelabWindow::onelabWindow(int deltaFontSize) : _stop(false)
...
@@ -739,11 +742,13 @@ onelabWindow::onelabWindow(int deltaFontSize) : _stop(false)
(
CTX
::
instance
()
->
solverPosition
[
0
],
CTX
::
instance
()
->
solverPosition
[
1
]);
(
CTX
::
instance
()
->
solverPosition
[
0
],
CTX
::
instance
()
->
solverPosition
[
1
]);
_win
->
end
();
_win
->
end
();
FL_NORMAL_SIZE
+=
deltaFontSize
;
FL_NORMAL_SIZE
+=
_
deltaFontSize
;
}
}
void
onelabWindow
::
rebuildTree
()
void
onelabWindow
::
rebuildTree
()
{
{
FL_NORMAL_SIZE
-=
_deltaFontSize
;
int
width
=
(
int
)(
0.5
*
_tree
->
w
());
int
width
=
(
int
)(
0.5
*
_tree
->
w
());
_tree
->
clear
();
_tree
->
clear
();
...
@@ -780,9 +785,9 @@ void onelabWindow::rebuildTree()
...
@@ -780,9 +785,9 @@ void onelabWindow::rebuildTree()
but
->
maximum
(
numbers
[
i
].
getMax
());
but
->
maximum
(
numbers
[
i
].
getMax
());
but
->
step
(
numbers
[
i
].
getStep
());
but
->
step
(
numbers
[
i
].
getStep
());
but
->
choices
(
numbers
[
i
].
getChoices
());
but
->
choices
(
numbers
[
i
].
getChoices
());
but
->
loop
(
numbers
[
i
].
getAttribute
(
"
l
oop"
));
but
->
loop
(
numbers
[
i
].
getAttribute
(
"
L
oop"
));
but
->
graph_x
(
numbers
[
i
].
getAttribute
(
"
g
raph
_x
"
));
but
->
graph_x
(
numbers
[
i
].
getAttribute
(
"
G
raph
X
"
));
but
->
graph_y
(
numbers
[
i
].
getAttribute
(
"
g
raph
_y
"
));
but
->
graph_y
(
numbers
[
i
].
getAttribute
(
"
G
raph
Y
"
));
but
->
align
(
FL_ALIGN_RIGHT
);
but
->
align
(
FL_ALIGN_RIGHT
);
but
->
callback
(
onelab_input_range_cb
,
(
void
*
)
n
);
but
->
callback
(
onelab_input_range_cb
,
(
void
*
)
n
);
but
->
when
(
FL_WHEN_RELEASE
|
FL_WHEN_ENTER_KEY
);
but
->
when
(
FL_WHEN_RELEASE
|
FL_WHEN_ENTER_KEY
);
...
@@ -838,6 +843,8 @@ void onelabWindow::rebuildTree()
...
@@ -838,6 +843,8 @@ void onelabWindow::rebuildTree()
}
}
_tree
->
redraw
();
_tree
->
redraw
();
FL_NORMAL_SIZE
+=
_deltaFontSize
;
}
}
void
onelabWindow
::
rebuildSolverList
()
void
onelabWindow
::
rebuildSolverList
()
...
...
This diff is collapsed.
Click to expand it.
Fltk/onelabWindow.h
+
1
−
0
View file @
e9bfb7ae
...
@@ -26,6 +26,7 @@ class onelabWindow{
...
@@ -26,6 +26,7 @@ class onelabWindow{
std
::
vector
<
Fl_Widget
*>
_treeWidgets
;
std
::
vector
<
Fl_Widget
*>
_treeWidgets
;
std
::
string
_title
;
std
::
string
_title
;
std
::
string
_modelExtension
;
std
::
string
_modelExtension
;
int
_deltaFontSize
;
bool
_stop
;
bool
_stop
;
public:
public:
onelabWindow
(
int
deltaFontSize
=
0
);
onelabWindow
(
int
deltaFontSize
=
0
);
...
...
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