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
48d542ed
Commit
48d542ed
authored
Apr 29, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
So now you define the camera outside the worker, and pass it as an argument to the worker
parent
63640556
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
cameraGui.py
cameraGui.py
+6
-1
zylaCameraWorker.py
zylaCameraWorker.py
+2
-6
No files found.
cameraGui.py
View file @
48d542ed
...
...
@@ -16,6 +16,9 @@ from pyqtgraph_subclasses import CustomRectangularROI
from
zylaCameraWorker
import
CameraWorker
from
cameraParameterTree
import
CameraParameterTree
from
drivers.andorzyla
import
AndorZyla
#from dummyAndor import AndorZyla
import
sys
import
numpy
as
np
...
...
@@ -189,8 +192,10 @@ class CameraGuiMainWindow(QMainWindow):
if
__name__
==
"__main__"
:
app
=
QtGui
.
QApplication
([])
camera
=
AndorZyla
(
0
)
myGuiMainWindow
=
CameraGuiMainWindow
()
cameraWorker
=
CameraWorker
()
cameraWorker
=
CameraWorker
(
andor_camera
=
camera
)
cameraWorker
.
make_connections
(
myGuiMainWindow
)
myGuiMainWindow
.
make_connections
(
cameraWorker
)
...
...
zylaCameraWorker.py
View file @
48d542ed
...
...
@@ -10,19 +10,16 @@ Created on Thu Apr 4 11:10:20 2019
import
numpy
as
np
from
PyQt5
import
QtCore
#from drivers.andorzyla import AndorZyla
from
dummyAndor
import
AndorZyla
import
threading
class
CameraWorker
(
QtCore
.
QObject
):
imageReadySignal
=
QtCore
.
pyqtSignal
(
np
.
ndarray
,
int
)
def
__init__
(
self
):
def
__init__
(
self
,
andor_camera
):
super
()
.
__init__
()
self
.
cam
=
AndorZyla
(
0
)
self
.
cam
=
andor_camera
self
.
cam
.
Init
()
#self.cam.ExposureTime.setValue(0.1)
print
(
"camera worker initialized"
)
...
...
@@ -79,7 +76,6 @@ class CameraWorker(QtCore.QObject):
@
QtCore
.
pyqtSlot
(
int
)
def
new_image_acquired
(
self
,
acq_index
):
self
.
imageReadySignal
.
emit
(
self
.
cam
.
acq_queue
.
get
(),
acq_index
)
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