Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
total_control_app
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Martin Drechsler
total_control_app
Commits
d98da911
Commit
d98da911
authored
May 19, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
joined backend threads in one
parent
b445f349
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
main.py
main.py
+7
-9
No files found.
main.py
View file @
d98da911
...
@@ -39,30 +39,28 @@ if __name__ == "__main__":
...
@@ -39,30 +39,28 @@ if __name__ == "__main__":
shutter866WM
=
digital_control_signal
(
'shutter866WM'
,
channel
=
3
,
inverse
=
False
)
shutter866WM
=
digital_control_signal
(
'shutter866WM'
,
channel
=
3
,
inverse
=
False
)
controlGui
=
ControlGui
()
controlGui
=
ControlGui
()
mcDAQt
hread
=
QtCore
.
QThread
()
backendT
hread
=
QtCore
.
QThread
()
for
ao
in
anal_control_signal
.
_registry
:
for
ao
in
anal_control_signal
.
_registry
:
controlGui
.
make_connections
(
ao
)
controlGui
.
make_connections
(
ao
)
ao
.
make_connections
(
controlGui
)
ao
.
make_connections
(
controlGui
)
ao
.
moveToThread
(
mcDAQt
hread
)
ao
.
moveToThread
(
backendT
hread
)
ao
.
scanTimer
.
moveToThread
(
mcDAQt
hread
)
ao
.
scanTimer
.
moveToThread
(
backendT
hread
)
ao
.
scanTimer
.
timeout
.
connect
(
ao
.
scan_event
)
ao
.
scanTimer
.
timeout
.
connect
(
ao
.
scan_event
)
for
do
in
digital_control_signal
.
_registry
:
for
do
in
digital_control_signal
.
_registry
:
do
.
make_connections
(
controlGui
)
do
.
make_connections
(
controlGui
)
do
.
moveToThread
(
mcDAQt
hread
)
do
.
moveToThread
(
backendT
hread
)
cameraMainWindow
=
CameraGuiMainWindow
()
cameraMainWindow
=
CameraGuiMainWindow
()
cameraWorker
=
CameraWorker
(
camera
)
cameraWorker
=
CameraWorker
(
camera
)
cameraThread
=
QtCore
.
QThread
()
cameraWorker
.
moveToThread
(
backendThread
)
cameraWorker
.
moveToThread
(
cameraThread
)
cameraWorker
.
make_connections
(
cameraMainWindow
)
cameraWorker
.
make_connections
(
cameraMainWindow
)
myGui
MainWindow
.
make_connections
(
cameraWorker
)
camera
MainWindow
.
make_connections
(
cameraWorker
)
cameraThread
.
start
()
backendThread
.
start
()
mcDAQthread
.
start
()
controlGui
.
toolbar
.
load
()
controlGui
.
toolbar
.
load
()
...
...
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