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
63640556
Commit
63640556
authored
Apr 26, 2019
by
Martin Drechsler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more changes
parent
e3836e5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
52 deletions
+2
-52
cameraGui.py
cameraGui.py
+0
-1
andorzyla.py
drivers/andorzyla.py
+0
-3
pyqtgraph_sublasses.py
pyqtgraph_sublasses.py
+0
-46
zylaCameraWorker.py
zylaCameraWorker.py
+2
-2
No files found.
cameraGui.py
View file @
63640556
...
@@ -63,7 +63,6 @@ class CameraGuiMainWindow(QMainWindow):
...
@@ -63,7 +63,6 @@ class CameraGuiMainWindow(QMainWindow):
self
.
label
=
QLabel
(
"Counter of frames"
)
self
.
label
=
QLabel
(
"Counter of frames"
)
self
.
d1
.
addWidget
(
self
.
label
)
self
.
d1
.
addWidget
(
self
.
label
)
self
.
param_tree
=
CameraParameterTree
()
self
.
param_tree
=
CameraParameterTree
()
self
.
d3
.
addWidget
(
self
.
param_tree
.
t
)
self
.
d3
.
addWidget
(
self
.
param_tree
.
t
)
...
...
drivers/andorzyla.py
View file @
63640556
...
@@ -747,10 +747,7 @@ class AndorBase(SDK3Camera):
...
@@ -747,10 +747,7 @@ class AndorBase(SDK3Camera):
while
getattr
(
t
,
"do_run"
,
True
):
while
getattr
(
t
,
"do_run"
,
True
):
a_s
,
px_encoding
,
xs
,
ys
,
bufs
=
self
.
_live_acq_auxs
a_s
,
px_encoding
,
xs
,
ys
,
bufs
=
self
.
_live_acq_auxs
try
:
try
:
# start = time.time()
pData
,
lData
=
SDK3
.
WaitBuffer
(
self
.
handle
,
10000
)
pData
,
lData
=
SDK3
.
WaitBuffer
(
self
.
handle
,
10000
)
# end = time.time()
# print(end-start)
except
:
except
:
return
return
img
=
create_aligned_array
(
xs
*
ys
,
'uint16'
)
img
=
create_aligned_array
(
xs
*
ys
,
'uint16'
)
...
...
pyqtgraph_sublasses.py
deleted
100644 → 0
View file @
e3836e5b
from
pyqtgraph
import
ROI
class
CustomRectangularROI
(
ROI
):
"""
Rectangular ROI subclass with a single scale handle at the top-right corner.
============== =============================================================
**Arguments**
pos (length-2 sequence) The position of the ROI origin.
See ROI().
size (length-2 sequence) The size of the ROI. See ROI().
centered (bool) If True, scale handles affect the ROI relative to its
center, rather than its origin.
sideScalers (bool) If True, extra scale handles are added at the top and
right edges.
\
**args All extra keyword arguments are passed to ROI()
============== =============================================================
"""
def
__init__
(
self
,
pos
,
size
=
[
8
,
8
],
centered
=
False
,
sideScalers
=
False
):
#ROI.__init__(self, pos, size, **args)
super
()
.
__init__
(
pos
,
size
,
centered
,
sideScalers
)
## handles scaling horizontally around center
self
.
addScaleHandle
([
1
,
0.5
],
[
0.5
,
0.5
])
self
.
addScaleHandle
([
0
,
0.5
],
[
0.5
,
0.5
])
## handles scaling vertically from opposite edge
self
.
addScaleHandle
([
0.5
,
0
],
[
0.5
,
1
])
self
.
addScaleHandle
([
0.5
,
1
],
[
0.5
,
0
])
## handles scaling both vertically and horizontally
self
.
addScaleHandle
([
1
,
1
],
[
0
,
0
])
self
.
addScaleHandle
([
0
,
0
],
[
1
,
1
])
self
.
sigRegionChangeFinished
.
connect
(
self
.
correct_scaling
)
def
correct_scaling
(
self
):
x
,
y
=
self
.
pos
()[
0
],
self
.
pos
()[
1
]
print
(
x
,
y
)
if
x
%
8
!=
0
or
y
%
8
!=
0
:
self
.
setPos
((
x
//
8
)
*
8
,
(
y
//
8
)
*
8
)
\ No newline at end of file
zylaCameraWorker.py
View file @
63640556
...
@@ -11,8 +11,8 @@ Created on Thu Apr 4 11:10:20 2019
...
@@ -11,8 +11,8 @@ Created on Thu Apr 4 11:10:20 2019
import
numpy
as
np
import
numpy
as
np
from
PyQt5
import
QtCore
from
PyQt5
import
QtCore
from
drivers.andorzyla
import
AndorZyla
#
from drivers.andorzyla import AndorZyla
#
from dummyAndor import AndorZyla
from
dummyAndor
import
AndorZyla
import
threading
import
threading
...
...
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