Skip to content

D
distributed oscilloscope
Commit 19d42213 authored by Milosz Malczak's avatar Milosz Malczak
Browse files
Options

gui: changed order of the functions

parent 654e76bc
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
software/DistributedOscilloscope/applications/pyqt_app/GUI.py
View file @ 19d42213
...@@ -80,17 +80,21 @@ class GUI_Class: ...@@ -80,17 +80,21 @@ class GUI_Class:
self.triggers[count].register_ADC(unique_ADC_name) self.triggers[count].register_ADC(unique_ADC_name)
return True 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) :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): for count in range(0, self.number_of_GUI_channels):
self.channels[count].set_ADC_unavailable(unique_ADC_name) self.channels[count].unregister_ADC(unique_ADC_name, True)
for count in range(0, self.number_of_GUI_triggers): 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): def set_ADC_available(self, unique_ADC_name):
""" """
...@@ -104,21 +108,17 @@ class GUI_Class: ...@@ -104,21 +108,17 @@ class GUI_Class:
for count in range(0, self.number_of_GUI_triggers): for count in range(0, self.number_of_GUI_triggers):
self.triggers[count].set_ADC_available(unique_ADC_name) 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) :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): for count in range(0, self.number_of_GUI_channels):
self.channels[count].unregister_ADC(unique_ADC_name, True) self.channels[count].set_ADC_unavailable(unique_ADC_name)
for count in range(0, self.number_of_GUI_triggers): for count in range(0, self.number_of_GUI_triggers):
#self.triggers[count].remove_trigger(True) self.triggers[count].set_ADC_unavailable(unique_ADC_name)
self.triggers[count].unregister_ADC(unique_ADC_name)
self.triggers[count].update_available_triggers_list()
return True
def update_data(self, data, pre_post_samples, offsets): def update_data(self, data, pre_post_samples, offsets):
""" """
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment