Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
distributed oscilloscope
Project
Project
Details
Activity
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
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Projects
distributed oscilloscope
Commits
19d42213
Commit
19d42213
authored
Aug 16, 2019
by
Milosz Malczak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gui: changed order of the functions
parent
654e76bc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
GUI.py
...ware/DistributedOscilloscope/applications/pyqt_app/GUI.py
+12
-12
No files found.
software/DistributedOscilloscope/applications/pyqt_app/GUI.py
View file @
19d42213
...
...
@@ -80,17 +80,21 @@ class GUI_Class:
self
.
triggers
[
count
]
.
register_ADC
(
unique_ADC_name
)
return
True
def
set_ADC_unavailable
(
self
,
unique_ADC_name
):
def
unregister_ADC
(
self
,
unique_ADC_name
):
"""
Makes the ADC unavailable when other Application uses this
ADC.
Unregisters an
ADC.
:param unique_ADC_name: name of the Device Application (ADC)
"""
self
.
available_ADCs
.
remove
(
unique_ADC_name
)
for
count
in
range
(
0
,
self
.
number_of_GUI_channels
):
self
.
channels
[
count
]
.
set_ADC_unavailable
(
unique_ADC_nam
e
)
self
.
channels
[
count
]
.
unregister_ADC
(
unique_ADC_name
,
Tru
e
)
for
count
in
range
(
0
,
self
.
number_of_GUI_triggers
):
self
.
triggers
[
count
]
.
set_ADC_unavailable
(
unique_ADC_name
)
#self.triggers[count].remove_trigger(True)
self
.
triggers
[
count
]
.
unregister_ADC
(
unique_ADC_name
)
self
.
triggers
[
count
]
.
update_available_triggers_list
()
return
True
def
set_ADC_available
(
self
,
unique_ADC_name
):
"""
...
...
@@ -104,21 +108,17 @@ class GUI_Class:
for
count
in
range
(
0
,
self
.
number_of_GUI_triggers
):
self
.
triggers
[
count
]
.
set_ADC_available
(
unique_ADC_name
)
def
unregister_ADC
(
self
,
unique_ADC_name
):
def
set_ADC_unavailable
(
self
,
unique_ADC_name
):
"""
Unregisters an
ADC.
Makes the ADC unavailable when other Application uses this
ADC.
:param unique_ADC_name: name of the Device Application (ADC)
"""
self
.
available_ADCs
.
remove
(
unique_ADC_name
)
for
count
in
range
(
0
,
self
.
number_of_GUI_channels
):
self
.
channels
[
count
]
.
unregister_ADC
(
unique_ADC_name
,
Tru
e
)
self
.
channels
[
count
]
.
set_ADC_unavailable
(
unique_ADC_nam
e
)
for
count
in
range
(
0
,
self
.
number_of_GUI_triggers
):
#self.triggers[count].remove_trigger(True)
self
.
triggers
[
count
]
.
unregister_ADC
(
unique_ADC_name
)
self
.
triggers
[
count
]
.
update_available_triggers_list
()
return
True
self
.
triggers
[
count
]
.
set_ADC_unavailable
(
unique_ADC_name
)
def
update_data
(
self
,
data
,
pre_post_samples
,
offsets
):
"""
...
...
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