Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
befcced2
Commit
befcced2
authored
Dec 12, 2019
by
yannick legoc
Browse files
Updated request of D22AutoConfig
parent
86b1af46
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/controllers/lss/d22autoconfig/D22AutoConfig.cpp
View file @
befcced2
...
...
@@ -157,6 +157,11 @@ float64 AutoConfig::getSampleBackground() {
cout
<<
"Model "
<<
modelName
<<
" found at index "
<<
i
<<
endl
;
if
(
m_simulation
->
pnames
.
getSize
()
<=
i
)
{
cout
<<
"Background not found"
<<
endl
;
return
0
;
}
int
pnamesSize
=
m_simulation
->
pnames
.
getSize
(
i
);
int
j
=
0
;
...
...
@@ -263,8 +268,13 @@ void AutoConfig::start() {
}
scatterModelType
=
autoConfigResponse
.
scattermodeltype
();
sampleRadius
=
autoConfigResponse
.
sampleradius
();
string
sampleRadiusString
;
for
(
int
i
=
0
;
i
<
autoConfigResponse
.
sampleradius_size
()
-
1
;
++
i
)
{
sampleRadiusString
+=
to_string
(
autoConfigResponse
.
sampleradius
(
i
))
+
", "
;
}
sampleRadiusString
+=
to_string
(
autoConfigResponse
.
sampleradius
(
autoConfigResponse
.
sampleradius_size
()
-
1
));
sampleRadius
=
sampleRadiusString
;
}
void
AutoConfig
::
apply
()
{
...
...
src/controllers/lss/d22autoconfig/D22AutoConfig.h
View file @
befcced2
...
...
@@ -63,7 +63,7 @@ public:
Property
<
bool
>
initialized
;
Property
<
std
::
string
>
scatterModelType
;
Property
<
float64
>
sampleRadius
;
Property
<
std
::
string
>
sampleRadius
;
Property
<
int32
>
resultSize
;
DynamicProperty
<
std
::
string
>
type
;
...
...
src/controllers/lss/d22autoconfig/NumorMessages.proto
View file @
befcced2
...
...
@@ -34,6 +34,6 @@ message Result {
message
Response
{
required
string
scatterModelType
=
1
;
re
quir
ed
double
sampleRadius
=
2
;
re
peat
ed
double
sampleRadius
=
2
;
repeated
Result
results
=
3
;
}
src/controllers/lss/d22autoconfig/gui/d22_auto_configProperties.xml
View file @
befcced2
...
...
@@ -3,7 +3,7 @@
<controller
type=
"d22_auto_config"
>
<property
name=
"scatter_model_type"
type=
"string"
/>
<property
name=
"sample_radius"
type=
"
float64
"
/>
<property
name=
"sample_radius"
type=
"
string
"
/>
<property
name=
"result_size"
type=
"int32"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment