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
9f168d1f
Commit
9f168d1f
authored
Apr 18, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some changes
parent
d9ca3b4a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
andorzyla.py
drivers/andorzyla.py
+0
-2
zylaCameraWorker.py
zylaCameraWorker.py
+3
-3
No files found.
drivers/andorzyla.py
View file @
9f168d1f
...
@@ -738,8 +738,6 @@ class AndorBase(SDK3Camera):
...
@@ -738,8 +738,6 @@ class AndorBase(SDK3Camera):
self
.
_live_acq_auxs
=
a_s
,
px_encoding
,
xs
,
ys
,
bufs
self
.
_live_acq_auxs
=
a_s
,
px_encoding
,
xs
,
ys
,
bufs
def
live_acquisition_loop
(
self
):
def
live_acquisition_loop
(
self
):
t
=
threading
.
currentThread
()
t
=
threading
.
currentThread
()
while
getattr
(
t
,
"do_run"
,
True
):
while
getattr
(
t
,
"do_run"
,
True
):
...
...
zylaCameraWorker.py
View file @
9f168d1f
...
@@ -5,7 +5,7 @@ Created on Thu Apr 4 11:10:20 2019
...
@@ -5,7 +5,7 @@ Created on Thu Apr 4 11:10:20 2019
@author: martindrech
@author: martindrech
Por ahora, aca se va a crear una imagen cada cierto tiempo y eso se va a mandar a toy_gui para plotearse ahi
"""
"""
import
numpy
as
np
import
numpy
as
np
...
@@ -39,7 +39,7 @@ class CameraWorker(QtCore.QObject):
...
@@ -39,7 +39,7 @@ class CameraWorker(QtCore.QObject):
frontend
.
sb
.
valueChanged
.
connect
(
lambda
x
=
frontend
.
sb
.
value
():
self
.
cam
.
ExposureTime
.
setValue
(
x
))
frontend
.
sb
.
valueChanged
.
connect
(
lambda
x
=
frontend
.
sb
.
value
():
self
.
cam
.
ExposureTime
.
setValue
(
x
))
#internal connections
#internal connections
self
.
cam
.
helper
.
imageAquiredSignal
.
connect
(
self
.
acquire
)
self
.
cam
.
helper
.
imageAquiredSignal
.
connect
(
self
.
new_image_acquired
)
def
__del__
(
self
):
def
__del__
(
self
):
...
@@ -75,7 +75,7 @@ class CameraWorker(QtCore.QObject):
...
@@ -75,7 +75,7 @@ class CameraWorker(QtCore.QObject):
@
QtCore
.
pyqtSlot
()
@
QtCore
.
pyqtSlot
()
def
acquire
(
self
):
def
new_image_acquired
(
self
):
#print('acquiring')
#print('acquiring')
self
.
imageReadySignal
.
emit
(
self
.
cam
.
current_image
)
self
.
imageReadySignal
.
emit
(
self
.
cam
.
current_image
)
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