Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bliss
bliss
Commits
d6db7c8a
Commit
d6db7c8a
authored
Dec 14, 2020
by
Jibril Mammeri
Browse files
Protect positioner property
parent
ca895bf4
Pipeline
#39085
passed with stages
in 99 minutes and 4 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bliss/common/alias.py
View file @
d6db7c8a
...
...
@@ -354,7 +354,7 @@ class MapWithAliases(Map):
def
get_axes_names_iter
(
self
):
for
axis
in
self
.
get_axes_iter
():
if
axis
.
positioner
:
if
axis
.
_
positioner
:
yield
axis
.
name
def
get_axes_positions_iter
(
self
,
on_error
=
None
):
...
...
@@ -373,7 +373,7 @@ class MapWithAliases(Map):
tasks
=
list
()
for
axis
in
self
.
get_axes_iter
():
if
axis
.
positioner
:
if
axis
.
_
positioner
:
tasks
.
append
(
gevent
.
spawn
(
request
,
axis
))
gevent
.
joinall
(
tasks
)
...
...
bliss/common/axis.py
View file @
d6db7c8a
...
...
@@ -741,12 +741,12 @@ class Axis:
return
self
.
__name
@
property
def
positioner
(
self
):
def
_
positioner
(
self
):
"""Axis positioner"""
return
self
.
__positioner
@
positioner
.
setter
def
positioner
(
self
,
new_p
):
@
_
positioner
.
setter
def
_
positioner
(
self
,
new_p
):
self
.
__positioner
=
new_p
@
autocomplete_property
...
...
bliss/common/soft_axis.py
View file @
d6db7c8a
...
...
@@ -21,7 +21,6 @@ def SoftAxis(
tolerance
=
None
,
export_to_session
=
True
,
unit
=
None
,
positioner
=
False
,
):
# if callable(position):
...
...
@@ -48,7 +47,7 @@ def SoftAxis(
controller
.
_init
()
axis
=
controller
.
get_axis
(
name
)
axis
.
positioner
=
positioner
axis
.
_
positioner
=
False
if
export_to_session
:
current_session
=
get_current_session
()
...
...
tests/controllers_sw/test_soft_axis.py
View file @
d6db7c8a
...
...
@@ -100,5 +100,5 @@ def test_soft_axis_iter_position_all(session):
o
=
Object
()
m0
=
SoftAxis
(
"bla"
,
o
)
assert
not
any
(
whereall
.
axis_name
==
"bla"
for
whereall
in
iter_axes_position_all
())
m0
.
positioner
=
True
m0
.
_
positioner
=
True
assert
any
(
whereall
.
axis_name
==
"bla"
for
whereall
in
iter_axes_position_all
())
Write
Preview
Supports
Markdown
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