Skip to content
GitLab
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
c177dc9e
Commit
c177dc9e
authored
Jun 16, 2021
by
Valentin Valls
Browse files
Remove scan simulator from Flint
parent
0f9b42d4
Pipeline
#48726
passed with stages
in 151 minutes and 37 seconds
Changes
6
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
bliss/flint/config.py
View file @
c177dc9e
...
...
@@ -61,13 +61,6 @@ def configure_parser_arguments(parser: ArgumentParser):
help
=
"Disable AA_ShareOpenGLContexts used by Qt in order to prevent "
"segmentation fault with some environment."
,
)
parser
.
add_argument
(
"--enable-simulator"
,
dest
=
"simulator"
,
action
=
"store_true"
,
default
=
False
,
help
=
"Enable scan simulation panel"
,
)
parser
.
add_argument
(
"--enable-gevent-poll"
,
dest
=
"gevent_poll"
,
...
...
bliss/flint/flint.py
View file @
c177dc9e
...
...
@@ -452,18 +452,6 @@ def main():
functools
.
partial
(
save_global_settings
,
flintModel
,
options
)
)
if
options
.
simulator
:
from
bliss.flint.simulator.acquisition
import
AcquisitionSimulator
from
bliss.flint.simulator.simulator_widget
import
SimulatorWidget
flintWindow
=
flintModel
.
mainWindow
()
display
=
SimulatorWidget
(
flintWindow
)
display
.
setFlintModel
(
flintModel
)
simulator
=
AcquisitionSimulator
(
display
)
simulator
.
setFlintModel
(
flintModel
)
display
.
setSimulator
(
simulator
)
display
.
show
()
sys
.
excepthook
=
handle_exception
def
close_service
(
frame
,
signum
):
...
...
bliss/flint/simulator/__init__.py
deleted
100755 → 0
View file @
0f9b42d4
# -*- coding: utf-8 -*-
#
# This file is part of the bliss project
#
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
"""
Package containing few data and process class to simulate a specific working
environment.
.. autosummary::
:toctree:
acquisition
simulator_widget
"""
bliss/flint/simulator/acquisition.py
deleted
100755 → 0
View file @
0f9b42d4
This diff is collapsed.
Click to expand it.
bliss/flint/simulator/simulator_widget.py
deleted
100755 → 0
View file @
0f9b42d4
# -*- coding: utf-8 -*-
#
# This file is part of the bliss project
#
# Copyright (c) 2015-2020 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
from
__future__
import
annotations
from
typing
import
Optional
import
gevent
import
logging
from
silx.gui
import
qt
from
bliss.flint.model
import
flint_model
from
bliss.flint.simulator.acquisition
import
AcquisitionSimulator
_logger
=
logging
.
getLogger
(
__name__
)
class
SimulatorWidget
(
qt
.
QMainWindow
):
def
__init__
(
self
,
parent
:
qt
.
QWidget
=
None
):
flags
=
qt
.
Qt
.
WindowStaysOnTopHint
super
(
SimulatorWidget
,
self
).
__init__
(
parent
=
parent
,
flags
=
flags
)
self
.
setWindowTitle
(
"Simulator"
)
self
.
__simulator
:
Optional
[
AcquisitionSimulator
]
=
None
self
.
__flintModel
:
Optional
[
flint_model
.
FlintState
]
=
None
self
.
__initLayout
()
def
__initLayout
(
self
):
panel
=
qt
.
QWidget
()
layout
=
qt
.
QVBoxLayout
(
panel
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"Counter scan"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__startScan
(
10
,
2000
,
"counter"
))
layout
.
addWidget
(
button
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"Slit scan"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__startScan
(
10
,
2000
,
"slit"
))
layout
.
addWidget
(
button
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"Counter scan (no masters)"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__startScan
(
10
,
2000
,
"counter-no-master"
))
layout
.
addWidget
(
button
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"Scatter scan"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__startScan
(
10
,
2000
,
"scatter"
))
layout
.
addWidget
(
button
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"Scatter 1000x1000 scan"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__startScan
(
10
,
20000
,
"scatter-big"
))
layout
.
addWidget
(
button
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"MCA scan"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__startScan
(
10
,
2000
,
"mca"
))
layout
.
addWidget
(
button
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"Image scan"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__startScan
(
10
,
2000
,
"image"
))
layout
.
addWidget
(
button
)
button
=
qt
.
QPushButton
(
self
)
button
.
setText
(
"Edit lima1:image ROIs"
)
button
.
clicked
.
connect
(
lambda
:
self
.
__editRoi
(
"lima1:image"
))
layout
.
addWidget
(
button
)
self
.
setCentralWidget
(
panel
)
def
setFlintModel
(
self
,
flintModel
:
flint_model
.
FlintState
):
self
.
__flintModel
=
flintModel
def
__editRoi
(
self
,
channelName
):
flint
=
self
.
__flintModel
.
flintApi
()
plotId
=
flint
.
get_live_scan_plot
(
channelName
,
"image"
)
gevent
.
spawn
(
flint
.
request_select_shapes
,
plotId
)
def
__startScan
(
self
,
interval
:
int
,
duration
:
int
,
name
=
None
):
if
self
.
__simulator
is
None
:
return
try
:
self
.
__simulator
.
start
(
interval
,
duration
,
name
)
except
Exception
:
_logger
.
error
(
"Error while starting scan"
,
exc_info
=
True
)
def
setSimulator
(
self
,
simulator
:
AcquisitionSimulator
):
self
.
__simulator
=
simulator
doc/docs/flint/flint_startup_options.md
View file @
c177dc9e
...
...
@@ -20,7 +20,6 @@ A command line argument use to override over equivalent settings.
--disable-share-opengl-contexts
Disable AA_ShareOpenGLContexts used by Qt in order to
prevent segmentation fault with some environment.
--enable-simulator Enable scan simulation panel
--enable-gevent-poll Enable system patching of the 'poll' function in order
to create a cooperative event loop between Qt and
gevent. It processes efficiently events from fast
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment