Skip to content

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

server, gui, test: pre and postsamples always sent together

parent 06fa7626
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 22 deletions
software/pyqt_app/horizontal_settings.py
View file @ eb5b3b96
......@@ -6,7 +6,7 @@ from PyQt5.QtWidgets import QHBoxLayout
class Presamples(Box):
def __init__(self, zmq_rpc, GUI_name, GUI):
def __init__(self, zmq_rpc, GUI_name, GUI, acq_set):
super().__init__(0, "No_ADC", "Presamples")
self.box.setMinimum(0)
self.box.setMaximum(1000000)
......@@ -14,14 +14,14 @@ class Presamples(Box):
self.zmq_rpc = zmq_rpc
self.GUI_name = GUI_name
self.GUI = GUI
self.acq_set = acq_set
def value_change(self):
presamples = self.box.value()
self.zmq_rpc.send_RPC('set_presamples', presamples, self.GUI_name)
self.GUI.update_GUI_params()
self.acq_set.set_pre_post_samples(presamples=presamples)
class Postsamples(Box):
def __init__(self, zmq_rpc, GUI_name, GUI):
def __init__(self, zmq_rpc, GUI_name, GUI, acq_set):
super().__init__(0, "No_ADC", "Postsamples")
self.box.setMinimum(0)
self.box.setMaximum(1000000)
......@@ -29,22 +29,33 @@ class Postsamples(Box):
self.zmq_rpc = zmq_rpc
self.GUI_name = GUI_name
self.GUI = GUI
self.acq_set = acq_set
def value_change(self):
postsamples = self.box.value()
self.zmq_rpc.send_RPC('set_postsamples', postsamples, self.GUI_name)
self.GUI.update_GUI_params()
self.acq_set.set_pre_post_samples(postsamples=postsamples)
class AcquisitionSettings(QHBoxLayout):
def __init__(self, zmq_rpc, GUI_name, GUI):
super().__init__()
self.zmq_rpc = zmq_rpc
self.GUI = GUI
self.GUI_name = GUI_name
self.presamples = Presamples(zmq_rpc, GUI_name, GUI)
self.postsamples = Postsamples(zmq_rpc, GUI_name, GUI)
self.presamples = Presamples(zmq_rpc, GUI_name, GUI, self)
self.postsamples = Postsamples(zmq_rpc, GUI_name, GUI, self)
self.addWidget(self.presamples)
self.addWidget(self.postsamples)
def set_params(self, presamples, postsamples):
self.presamples.set_value(presamples)
self.postsamples.set_value(postsamples)
def set_pre_post_samples(self, presamples=None, postsamples=None):
if not presamples:
presamples = self.presamples.get_value()
if not postsamples:
postsamples = self.postsamples.get_value()
self.zmq_rpc.send_RPC('set_pre_post_samples', presamples, postsamples,
self.GUI_name)
self.GUI.update_GUI_params()
software/pyqt_app/parent_classes.py
View file @ eb5b3b96
......@@ -77,6 +77,9 @@ class Box(QtGui.QWidget):
def set_value(self, value):
self.box.setValue(value)
def get_value(self):
return self.box.value()
class TriggerPolarity(Menu):
......
software/server/GUI.py
View file @ eb5b3b96
......@@ -103,14 +103,11 @@ class GUI():
"""here I set the GUI in the ADC, it is removed in methods
remove_channel/remove_trigger"""
def set_presamples(self, value):
def set_pre_post_samples(self, presamples, postsamples):
for ADC in self.__ADCs_used:
ADC.set_ADC_parameter('presamples', value)
self.__check_horizontal_settings()
def set_postsamples(self, value):
ADC.set_ADC_parameter('presamples', presamples)
for ADC in self.__ADCs_used:
ADC.set_ADC_parameter('postsamples', value)
ADC.set_ADC_parameter('postsamples', postsamples)
self.__check_horizontal_settings()
def run_acquisition(self, run):
......
software/server/expose.py
View file @ eb5b3b96
......@@ -52,13 +52,9 @@ class Expose():
GUI = self.__connection_manager.get_GUI(GUI_name)
GUI.run_acquisition(run)
def set_presamples(self, value, GUI_name):
def set_pre_post_samples(self, presamples, postsamples, GUI_name):
GUI = self.__connection_manager.get_GUI(GUI_name)
GUI.set_presamples(value)
def set_postsamples(self, value, GUI_name):
GUI = self.__connection_manager.get_GUI(GUI_name)
GUI.set_postsamples(value)
GUI.set_pre_post_samples(presamples, postsamples)
def get_GUI_settings(self, GUI_name):
GUI = self.__connection_manager.get_GUI(GUI_name)
......
software/tests/test_all.py
View file @ eb5b3b96
......@@ -170,12 +170,11 @@ class OscilloscopeMethods(unittest.TestCase):
ADC_trigger_idx, self.GUI_name)
send_RPC('set_ADC_parameter', 'internal_trigger_enable', 1,
unique_ADC_name, ADC_trigger_idx)
self.zmq_rpc.send_RPC('set_presamples', 0, self.GUI_name)
for i in range(0, 6):
postsamples = 10**i
if postsamples == 1:
postsamples = 2 # that is the minimum available value
self.zmq_rpc.send_RPC('set_postsamples', postsamples,
self.zmq_rpc.send_RPC('set_pre_post_samples', 0, postsamples,
self.GUI_name)
self.results.write("Postsamples: " + str(postsamples) + "\n")
best_result = 100000
......
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