Commit a3e8a24a authored by Martin Drechsler's avatar Martin Drechsler

oven control as an electrode added

parent 014be47f
...@@ -112,13 +112,14 @@ class GuiMainWindow(QMainWindow): ...@@ -112,13 +112,14 @@ class GuiMainWindow(QMainWindow):
self.piezoB397 = anal_control_signal('piezoB397', 7, out_step = 0.01) self.piezoB397 = anal_control_signal('piezoB397', 7, out_step = 0.01)
self.piezoA866 = anal_control_signal('piezoA866', 14, out_minimum=0, out_maximum=4, out_step=0.01) self.piezoA866 = anal_control_signal('piezoA866', 14, out_minimum=0, out_maximum=4, out_step=0.01)
self.piezoB866 = anal_control_signal('piezoB866', 6, out_step = 0.01) self.piezoB866 = anal_control_signal('piezoB866', 6, out_step = 0.01)
self.piezoA423 = anal_control_signal('piezoA423', 1, out_step = 0.01, feedfoward=True) self.piezoA423 = anal_control_signal('piezoA423', 1, out_step = 0.01)
self.piezoA423.set_scan_feedfoward_analog_out(0)
self.trapDCA = anal_control_signal('DC A', 2) self.trapDCA = anal_control_signal('DC A', 2)
self.trapDCB = anal_control_signal('DC B', 3) self.trapDCB = anal_control_signal('DC B', 3)
self.trapCompC = anal_control_signal('Comp C', 4) self.trapCompC = anal_control_signal('Comp C', 4)
self.trapCompD = anal_control_signal('Comp D', 5) self.trapCompD = anal_control_signal('Comp D', 5)
self.trapCompOven = anal_control_signal('Comp Oven', 0)
...@@ -199,9 +200,6 @@ class GuiMainWindow(QMainWindow): ...@@ -199,9 +200,6 @@ class GuiMainWindow(QMainWindow):
self.layout423_scan.addWidget(self.piezoA423.scanLabelValue, 5, 0) self.layout423_scan.addWidget(self.piezoA423.scanLabelValue, 5, 0)
self.layout423_scan.addWidget(self.piezoA423.scanpBar, 5, 1) self.layout423_scan.addWidget(self.piezoA423.scanpBar, 5, 1)
self.layout423_scan.addWidget(self.piezoA423.scan_feedfoward_button, 6, 0)
self.layout423_scan.addWidget(self.piezoA423.scan_feedfoward_sb, 6, 1)
######################### #########################
...@@ -211,7 +209,7 @@ class GuiMainWindow(QMainWindow): ...@@ -211,7 +209,7 @@ class GuiMainWindow(QMainWindow):
self.layout_trap_electrodes.addWidget(QtGui.QLabel(self.trapDCB.name), 2, 1), self.layout_trap_electrodes.addWidget(self.trapDCB.sb, 2, 2) self.layout_trap_electrodes.addWidget(QtGui.QLabel(self.trapDCB.name), 2, 1), self.layout_trap_electrodes.addWidget(self.trapDCB.sb, 2, 2)
self.layout_trap_electrodes.addWidget(QtGui.QLabel(self.trapCompC.name), 1, 3), self.layout_trap_electrodes.addWidget(self.trapCompC.sb, 1, 4) self.layout_trap_electrodes.addWidget(QtGui.QLabel(self.trapCompC.name), 1, 3), self.layout_trap_electrodes.addWidget(self.trapCompC.sb, 1, 4)
self.layout_trap_electrodes.addWidget(QtGui.QLabel(self.trapCompD.name), 2, 3), self.layout_trap_electrodes.addWidget(self.trapCompD.sb, 2, 4) self.layout_trap_electrodes.addWidget(QtGui.QLabel(self.trapCompD.name), 2, 3), self.layout_trap_electrodes.addWidget(self.trapCompD.sb, 2, 4)
self.layout_trap_electrodes.addWidget(QtGui.QLabel(self.trapCompOven.name), 1, 5), self.layout_trap_electrodes.addWidget(self.trapCompOven.sb, 1, 6)
########################################################### ###########################################################
......
...@@ -88,7 +88,10 @@ class myToolbarMenu(QWidget): ...@@ -88,7 +88,10 @@ class myToolbarMenu(QWidget):
spin_boxes = ao.spin_boxes spin_boxes = ao.spin_boxes
for text, spinb in spin_boxes: for text, spinb in spin_boxes:
spin = settings.value(str(ao.name) + '_' + text) spin = settings.value(str(ao.name) + '_' + text)
spinb.setValue( float(spin) ) try:
spinb.setValue( float(spin) )
except TypeError:
spinb.setValue( float(ao.initial_value) )
settings.endGroup() settings.endGroup()
def first_load(self, aos): def first_load(self, aos):
......
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