diff --git a/pyrpl/gui/iq_gui.py b/pyrpl/gui/iq_gui.py index 4920326fb..c1a39eea4 100644 --- a/pyrpl/gui/iq_gui.py +++ b/pyrpl/gui/iq_gui.py @@ -142,9 +142,19 @@ def paint(self, painter, style, widget): class MyFrame(QtGui.QFrame): def __init__(self ,parent): - super(MyFrame, self).__init__() + super(MyFrame, self).__init__(parent) self.setStyleSheet("background-color: white;") self.parent = parent + self.lower() + #self.proxy = self.parent.scene.addWidget(self) + #self.proxy.setZValue(-1) + +class MyFrameDrawing(QtGui.QFrame): + def __init__(self , parent): + super(MyFrameDrawing, self).__init__() + self.setStyleSheet("background-color: white;") + self.parent = parent + self.lower() self.proxy = self.parent.scene.addWidget(self) self.proxy.setZValue(-1) @@ -191,8 +201,11 @@ def adjust_drawing(self): "bandwidth", "quadrature_factor", "gain", "amplitude", "output_direct"][::2]): widget = iq.properties[prop].widget - self.frames[index].setFixedSize(widget.width(), self.view.height()) - self.frames[index].move(widget.x(),0) + self.frames[index].setFixedSize(widget.width() + iq.main_layout.spacing(), self.height()) + self.frames[index].move(widget.x() + iq.pos().x() - iq.main_layout.spacing()/2, 0) + + self.frames_drawing[index].setFixedSize(widget.width() + iq.main_layout.spacing(), self.height()) + self.frames_drawing[index].move(widget.x() + iq.pos().x() - self.view.pos().x() - iq.main_layout.spacing()/2, 0) self.scene.setSceneRect(QtCore.QRectF(self.view.rect())) @@ -255,6 +268,8 @@ def make_drawing(self): self.connect(self.output_direct, self.output_signal, h_first=False) self.frames = [MyFrame(self) for i in range(4)] + self.frames_drawing = [MyFrameDrawing(self) for i in range(4)] + diff --git a/pyrpl/gui/redpitaya_gui.py b/pyrpl/gui/redpitaya_gui.py index cd65cf942..234b31960 100644 --- a/pyrpl/gui/redpitaya_gui.py +++ b/pyrpl/gui/redpitaya_gui.py @@ -235,13 +235,6 @@ def __init__(self, number, name, options): self.lay = QtGui.QHBoxLayout() self.combos = [] self.options = options - """ - vals = [int(2.371593461809983*2**n) for n in range(1, 27)] - self._options = [0] + vals - vals = [-val for val in reversed(vals)] - self._options = vals + self._options - self._options = list(map(str, self._options)) - """ for i in range(number): combo = QtGui.QComboBox() self.combos.append(combo) diff --git a/pyrpl/redpitaya_modules.py b/pyrpl/redpitaya_modules.py index ef1f890af..8103d9e39 100644 --- a/pyrpl/redpitaya_modules.py +++ b/pyrpl/redpitaya_modules.py @@ -1344,7 +1344,7 @@ def acbandwidth(self): @acbandwidth.setter def acbandwidth(self, val): - val = int(val) + val = float(val) self.inputfilter = -val return val