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
8ba0a33b
Commit
8ba0a33b
authored
Apr 18, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
everything merged properly
parent
e5b1ea04
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
dummyAndor.py
dummyAndor.py
+5
-4
zylaCameraWorker.py
zylaCameraWorker.py
+4
-7
No files found.
dummyAndor.py
View file @
8ba0a33b
...
...
@@ -11,7 +11,7 @@ import time
import
threading
class
Helper_messager
(
QtCore
.
QObject
):
imageAquiredSignal
=
QtCore
.
pyqtSignal
()
imageAquiredSignal
=
QtCore
.
pyqtSignal
(
int
)
class
AndorZyla
():
...
...
@@ -25,7 +25,7 @@ class AndorZyla():
self
.
CameraAcquiring
.
setValue
(
False
)
self
.
acq_index_i
=
0
def
Init
(
self
):
print
(
'Dummy camera initialized'
)
...
...
@@ -35,12 +35,13 @@ class AndorZyla():
while
getattr
(
t
,
"do_run"
,
True
):
time
.
sleep
(
self
.
ExposureTime
.
getValue
())
self
.
current_image
=
self
.
_twoD_gaussian
()
self
.
helper
.
imageAquiredSignal
.
emit
()
self
.
helper
.
imageAquiredSignal
.
emit
(
self
.
acq_index_i
)
self
.
acq_index_i
=
self
.
acq_index_i
+
1
print
(
'stopping acq loop thread'
)
def
live_acquisition_configure
(
self
):
pass
self
.
acq_index_i
=
0
def
AcquisitionStart
(
self
):
self
.
CameraAcquiring
.
setValue
(
True
)
...
...
zylaCameraWorker.py
View file @
8ba0a33b
...
...
@@ -10,8 +10,8 @@ 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
#
from drivers.andorzyla import AndorZyla
from
dummyAndor
import
AndorZyla
import
threading
...
...
@@ -26,9 +26,6 @@ class CameraWorker(QtCore.QObject):
self
.
cam
=
AndorZyla
(
0
)
self
.
cam
.
Init
()
self
.
cam
.
ExposureTime
.
setValue
(
.1
)
#self.cam.FrameRate.setValue(9)
self
.
cam
.
AOIBinning
.
setIndex
(
4
)
self
.
isCameraAcquiring
=
False
...
...
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