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
00659812
Commit
00659812
authored
May 11, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small change in dummy andor so that it changes image size with binning
parent
f6b374b5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
44 deletions
+4
-44
dummyAndor.py
drivers/dummyAndor.py
+4
-6
measurement.py
measurement.py
+0
-38
No files found.
drivers/dummyAndor.py
View file @
00659812
...
@@ -54,15 +54,10 @@ class AndorZyla:
...
@@ -54,15 +54,10 @@ class AndorZyla:
def
live_acquisition_loop
(
self
):
def
live_acquisition_loop
(
self
):
self
.
_set_image_area
()
self
.
images_array
=
[]
if
self
.
TriggerMode
.
getString
()
==
'Software'
:
if
self
.
TriggerMode
.
getString
()
==
'Software'
:
pass
pass
else
:
else
:
t
=
threading
.
currentThread
()
t
=
threading
.
currentThread
()
for
i
in
range
(
10
):
self
.
images_array
.
append
(
self
.
_twoD_gaussian
())
while
getattr
(
t
,
"do_run"
,
True
):
while
getattr
(
t
,
"do_run"
,
True
):
self
.
current_image
=
self
.
images_array
[
self
.
acq_index_i
%
10
]
self
.
current_image
=
self
.
images_array
[
self
.
acq_index_i
%
10
]
self
.
wait_for_image
()
self
.
wait_for_image
()
...
@@ -91,6 +86,9 @@ class AndorZyla:
...
@@ -91,6 +86,9 @@ class AndorZyla:
def
_set_image_area
(
self
):
def
_set_image_area
(
self
):
d
=
{
'1x1'
:
2048
,
'2x2'
:
1024
,
'4x4'
:
512
,
'8x8'
:
256
}
d
=
{
'1x1'
:
2048
,
'2x2'
:
1024
,
'4x4'
:
512
,
'8x8'
:
256
}
self
.
ImageArea
.
setValue
(
d
[
self
.
AOIBinning
.
getValue
()])
self
.
ImageArea
.
setValue
(
d
[
self
.
AOIBinning
.
getValue
()])
self
.
images_array
=
[]
for
i
in
range
(
10
):
self
.
images_array
.
append
(
self
.
_twoD_gaussian
())
def
_twoD_gaussian
(
self
,
lim
=
10
,
sigma
=
1
,
x0
=
0
,
y0
=
0
):
def
_twoD_gaussian
(
self
,
lim
=
10
,
sigma
=
1
,
x0
=
0
,
y0
=
0
):
N
=
self
.
ImageArea
.
getValue
()
N
=
self
.
ImageArea
.
getValue
()
...
...
measurement.py
View file @
00659812
...
@@ -74,45 +74,7 @@ class MeasurementFrame(QtWidgets.QFrame, Ui_Frame):
...
@@ -74,45 +74,7 @@ class MeasurementFrame(QtWidgets.QFrame, Ui_Frame):
self
.
treeModel
.
setData
(
self
.
treeModel
.
index
(
0
,
1
),
(
self
.
endValue
.
value
()
-
self
.
startValue
.
value
())
/
self
.
stepsNum
.
value
()
)
self
.
treeModel
.
setData
(
self
.
treeModel
.
index
(
0
,
1
),
(
self
.
endValue
.
value
()
-
self
.
startValue
.
value
())
/
self
.
stepsNum
.
value
()
)
except
:
except
:
self
.
treeModel
.
setData
(
self
.
treeModel
.
index
(
0
,
1
),
'?'
)
self
.
treeModel
.
setData
(
self
.
treeModel
.
index
(
0
,
1
),
'?'
)
"""
class MeasurementWorker(QtCore.QObject):
Backend for the measurement frame.
Simple scan measurement: for scanning a spinbox.
External scan measurement: scans an external object. For example, the rigol function generator.
def __init__(self):
super().__init__()
def make_connections(self, frontend, camera):
frontend.startMeasureButton.clicked.connect(self.simple_scan_measurement)
def simple_scan_measurement(self):
for l in LaserControlLayout._registry + LaserScanLayout._registry :
l.freeze()
scanSignal = self.get_scan_signal()
scan_array = create_measurement_array() # aca necesito parametros de los spinboxes de la measurementGUi
prepare_camara_to_triggered_acq() #includes stopping acquisition if it is in acq live
create_temporary_data_files
measurement loop:
set_scan_signal
wait_predefined_time
take_and_recibe_image
process_image_to_get_data
save_data
update_camera_gui_with_image_and_data
update_measurement_gui
for l in LaserControlLayout._registry + LaserScanLayout._registry :
l.unfreeze()
"""
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
import
sys
import
sys
from
PyQt5
import
QtWidgets
from
PyQt5
import
QtWidgets
...
...
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