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
37b2f363
Commit
37b2f363
authored
12 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
make it clear that you need to select an executable when running a client for the first time
parent
f673b586
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Fltk/onelabGroup.cpp
+14
-4
14 additions, 4 deletions
Fltk/onelabGroup.cpp
with
14 additions
and
4 deletions
Fltk/onelabGroup.cpp
+
14
−
4
View file @
37b2f363
...
@@ -660,6 +660,14 @@ static void onelab_choose_executable_cb(Fl_Widget *w, void *data)
...
@@ -660,6 +660,14 @@ static void onelab_choose_executable_cb(Fl_Widget *w, void *data)
const
char
*
old
=
0
;
const
char
*
old
=
0
;
if
(
!
c
->
getExecutable
().
empty
())
old
=
c
->
getExecutable
().
c_str
();
if
(
!
c
->
getExecutable
().
empty
())
old
=
c
->
getExecutable
().
c_str
();
if
(
!
w
){
const
char
*
old
=
fl_close
;
fl_close
=
"OK"
;
fl_message
(
"This appears to be the first time you are trying to run %s.
\n\n
"
"Please select the path to the executable."
,
c
->
getName
().
c_str
());
fl_close
=
old
;
}
std
::
string
title
=
"Choose location of "
+
c
->
getName
()
+
" executable"
;
std
::
string
title
=
"Choose location of "
+
c
->
getName
()
+
" executable"
;
if
(
fileChooser
(
FILE_CHOOSER_SINGLE
,
title
.
c_str
(),
pattern
.
c_str
(),
old
)){
if
(
fileChooser
(
FILE_CHOOSER_SINGLE
,
title
.
c_str
(),
pattern
.
c_str
(),
old
)){
std
::
string
exe
=
fileChooserGetName
(
1
);
std
::
string
exe
=
fileChooserGetName
(
1
);
...
@@ -1506,8 +1514,11 @@ void onelabGroup::rebuildSolverList()
...
@@ -1506,8 +1514,11 @@ void onelabGroup::rebuildSolverList()
void
onelabGroup
::
addSolver
(
const
std
::
string
&
name
,
const
std
::
string
&
executable
,
void
onelabGroup
::
addSolver
(
const
std
::
string
&
name
,
const
std
::
string
&
executable
,
const
std
::
string
&
remoteLogin
,
int
index
)
const
std
::
string
&
remoteLogin
,
int
index
)
{
{
if
(
onelab
::
server
::
instance
()
->
findClient
(
name
)
!=
onelab
::
server
::
citer
it
=
onelab
::
server
::
instance
()
->
findClient
(
name
);
onelab
::
server
::
instance
()
->
lastClient
())
return
;
// solver already exists
if
(
it
!=
onelab
::
server
::
instance
()
->
lastClient
()){
if
(
executable
.
empty
())
onelab_choose_executable_cb
(
0
,
(
void
*
)
it
->
second
);
return
;
// solver already exists
}
// unregister the other non-local clients so we keep only the new one
// unregister the other non-local clients so we keep only the new one
std
::
vector
<
onelab
::
client
*>
networkClients
;
std
::
vector
<
onelab
::
client
*>
networkClients
;
...
@@ -1525,8 +1536,7 @@ void onelabGroup::addSolver(const std::string &name, const std::string &executab
...
@@ -1525,8 +1536,7 @@ void onelabGroup::addSolver(const std::string &name, const std::string &executab
remoteLogin
);
remoteLogin
);
c
->
setIndex
(
index
);
c
->
setIndex
(
index
);
opt_solver_name
(
index
,
GMSH_SET
,
name
);
opt_solver_name
(
index
,
GMSH_SET
,
name
);
if
(
executable
.
empty
())
if
(
executable
.
empty
())
onelab_choose_executable_cb
(
0
,
(
void
*
)
c
);
onelab_choose_executable_cb
(
0
,
(
void
*
)
c
);
opt_solver_remote_login
(
index
,
GMSH_SET
,
remoteLogin
);
opt_solver_remote_login
(
index
,
GMSH_SET
,
remoteLogin
);
FlGui
::
instance
()
->
onelab
->
rebuildSolverList
();
FlGui
::
instance
()
->
onelab
->
rebuildSolverList
();
...
...
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