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
70355361
Commit
70355361
authored
May 19, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed an useless function
parent
0ae0b306
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
9 deletions
+0
-9
zylaCameraWorker.py
zylaCameraWorker.py
+0
-9
No files found.
zylaCameraWorker.py
View file @
70355361
...
@@ -119,10 +119,6 @@ class CameraWorker(QtCore.QObject):
...
@@ -119,10 +119,6 @@ class CameraWorker(QtCore.QObject):
def
new_image_acquired
(
self
,
acq_index
):
def
new_image_acquired
(
self
,
acq_index
):
self
.
imageReadySignal
.
emit
(
self
.
cam
.
acq_queue
.
get
(),
acq_index
)
self
.
imageReadySignal
.
emit
(
self
.
cam
.
acq_queue
.
get
(),
acq_index
)
@
QtCore
.
pyqtSlot
(
int
)
def
new_image_acquired_with_trigger
(
self
,
acq_index
):
self
.
imageReadySignal
.
emit
(
self
.
cam
.
acq_queue
.
get
(),
acq_index
)
def
simple_scan_measurement_start
(
self
,
measure_params
):
def
simple_scan_measurement_start
(
self
,
measure_params
):
if
self
.
cam
.
CameraAcquiring
.
getValue
():
if
self
.
cam
.
CameraAcquiring
.
getValue
():
...
@@ -143,9 +139,6 @@ class CameraWorker(QtCore.QObject):
...
@@ -143,9 +139,6 @@ class CameraWorker(QtCore.QObject):
self
.
storage
.
append_metadata_to_current_file
(
measure_params
[
'spinboxes_dict'
],
self
.
cam
.
GetMetaData
(),
measure_params
)
self
.
storage
.
append_metadata_to_current_file
(
measure_params
[
'spinboxes_dict'
],
self
.
cam
.
GetMetaData
(),
measure_params
)
self
.
cam
.
TriggerMode
.
setString
(
'Software'
)
self
.
cam
.
TriggerMode
.
setString
(
'Software'
)
self
.
cam
.
helper
.
imageAquiredSignal
.
disconnect
(
self
.
new_image_acquired
)
self
.
cam
.
helper
.
imageAquiredSignal
.
connect
(
self
.
new_image_acquired_with_trigger
)
self
.
_start_acquisition_loop
()
self
.
_start_acquisition_loop
()
self
.
acq_thread
=
threading
.
Thread
(
self
.
acq_thread
=
threading
.
Thread
(
...
@@ -160,8 +153,6 @@ class CameraWorker(QtCore.QObject):
...
@@ -160,8 +153,6 @@ class CameraWorker(QtCore.QObject):
self
.
_stop_acquisition_loop
()
self
.
_stop_acquisition_loop
()
self
.
cam
.
TriggerMode
.
setString
(
'Internal'
)
self
.
cam
.
TriggerMode
.
setString
(
'Internal'
)
self
.
cam
.
helper
.
imageAquiredSignal
.
disconnect
(
self
.
new_image_acquired_with_trigger
)
self
.
cam
.
helper
.
imageAquiredSignal
.
connect
(
self
.
new_image_acquired
)
self
.
measurementEndingSignal
.
emit
()
self
.
measurementEndingSignal
.
emit
()
print
(
'exiting scan ending in worker'
)
print
(
'exiting scan ending in worker'
)
...
...
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