Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
gepetto-viewer-corba
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
Container Registry
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Guilhem Saurel
gepetto-viewer-corba
Commits
6273de78
Commit
6273de78
authored
7 years ago
by
Joseph Mirabel
Committed by
Joseph Mirabel
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add missing #ifdef in settings.cc
parent
acb3164c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/gui/settings.cc
+8
-1
8 additions, 1 deletion
src/gui/settings.cc
with
8 additions
and
1 deletion
src/gui/settings.cc
+
8
−
1
View file @
6273de78
...
...
@@ -100,7 +100,9 @@ namespace gepetto {
au
->
addCommandLineOption
(
"--add-robot"
,
"Add a robot (a list of comma sperated string)"
);
au
->
addCommandLineOption
(
"--add-env"
,
"Add an environment (a list of comma sperated string)"
);
au
->
addCommandLineOption
(
"-p or --load-plugin"
,
"load the plugin"
);
#if GEPETTO_GUI_HAS_PYTHONQT
au
->
addCommandLineOption
(
"-q or --load-pyplugin"
,
"load the PythonQt module as a plugin"
);
#endif
au
->
addCommandLineOption
(
"-P or --no-plugin"
,
"do not load any plugin"
);
au
->
addCommandLineOption
(
"-w or --auto-write-settings"
,
"write the settings in the configuration file"
);
au
->
addCommandLineOption
(
"--no-viewer-server"
,
"do not start the Gepetto Viewer server"
);
...
...
@@ -129,8 +131,10 @@ namespace gepetto {
addEnvFromString
(
opt
);
while
(
arguments
.
read
(
"-p"
,
opt
)
||
arguments
.
read
(
"--load-plugin"
,
opt
))
addPlugin
(
QString
::
fromStdString
(
opt
),
!
noPlugin
);
#if GEPETTO_GUI_HAS_PYTHONQT
while
(
arguments
.
read
(
"-q"
,
opt
)
||
arguments
.
read
(
"--load-pyplugin"
,
opt
))
addPyPlugin
(
QString
::
fromStdString
(
opt
),
!
noPlugin
);
#endif
if
(
arguments
.
read
(
"-c"
,
configurationFile
)
||
arguments
.
read
(
"--config-file"
,
configurationFile
))
{}
if
(
arguments
.
read
(
"--predefined-robots"
,
predifinedRobotConf
))
{}
...
...
@@ -196,7 +200,8 @@ namespace gepetto {
mw
=
main
;
}
std
::
ostream
&
Settings
::
print
(
std
::
ostream
&
os
)
{
std
::
ostream
&
Settings
::
print
(
std
::
ostream
&
os
)
{
const
char
tab
=
'\t'
;
const
char
nl
=
'\n'
;
return
os
...
...
@@ -294,11 +299,13 @@ namespace gepetto {
addPlugin
(
name
,
(
noPlugin
)
?
false
:
env
.
value
(
name
,
true
).
toBool
());
}
env
.
endGroup
();
#if GEPETTO_GUI_HAS_PYTHONQT
env
.
beginGroup
(
"pyplugins"
);
foreach
(
QString
name
,
env
.
childKeys
())
{
addPyPlugin
(
name
,
(
noPlugin
)
?
false
:
env
.
value
(
name
,
true
).
toBool
());
}
env
.
endGroup
();
#endif
log
(
QString
(
"Read configuration file "
)
+
env
.
fileName
());
}
}
...
...
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