|
@@ -73,6 +73,13 @@ class Ui_MainWindow(object):
|
|
|
self.graphicsView.setObjectName(_fromUtf8("graphicsView"))
|
|
|
self.t1_vertical.addWidget(self.graphicsView)
|
|
|
|
|
|
+
|
|
|
+ #
|
|
|
+ # pic = QtGui.QLabel(window)
|
|
|
+ # pic.setGeometry(10, 10, 400, 100)
|
|
|
+ # #use full ABSOLUTE path to the image, not relative
|
|
|
+ # pic.setPixmap(QtGui.QPixmap(os.getcwd() + "/logo.png"))
|
|
|
+
|
|
|
# TAB for modulation view
|
|
|
self.imView = pg.GraphicsLayoutWidget()
|
|
|
self.modplot = self.imView.addPlot()
|
|
@@ -340,7 +347,7 @@ class Ui_MainWindow(object):
|
|
|
self.spinBox_int_delay.setMaximumSize(QtCore.QSize(300, 16777215))
|
|
|
self.spinBox_int_delay.setObjectName(_fromUtf8("spinBox_int_delay"))
|
|
|
self.spinBox_int_delay.setRange(1,1023)
|
|
|
- self.spinBox_int_delay.setSingleStep(8)
|
|
|
+ self.spinBox_int_delay.setSingleStep(1)
|
|
|
self.gridLayout.addWidget(self.spinBox_int_delay, 3, 1, 1, 1)
|
|
|
|
|
|
## GOTT gain
|
|
@@ -639,14 +646,14 @@ class Ui_MainWindow(object):
|
|
|
self.label_log.setObjectName(_fromUtf8("label_log"))
|
|
|
self.verticalLayout_9.addWidget(self.label_log)
|
|
|
|
|
|
- self.checkBox_cont_acq = QtGui.QCheckBox(self.centralwidget)
|
|
|
- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
|
|
|
- sizePolicy.setHorizontalStretch(0)
|
|
|
- sizePolicy.setVerticalStretch(0)
|
|
|
- sizePolicy.setHeightForWidth(self.checkBox_cont_acq.sizePolicy().hasHeightForWidth())
|
|
|
- self.checkBox_cont_acq.setSizePolicy(sizePolicy)
|
|
|
- self.checkBox_cont_acq.setObjectName(_fromUtf8("checkBox_cont_acq"))
|
|
|
- self.verticalLayout_9.addWidget(self.checkBox_cont_acq)
|
|
|
+ # self.checkBox_cont_acq = QtGui.QCheckBox(self.centralwidget)
|
|
|
+ # sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
|
|
|
+ # sizePolicy.setHorizontalStretch(0)
|
|
|
+ # sizePolicy.setVerticalStretch(0)
|
|
|
+ # sizePolicy.setHeightForWidth(self.checkBox_cont_acq.sizePolicy().hasHeightForWidth())
|
|
|
+ # self.checkBox_cont_acq.setSizePolicy(sizePolicy)
|
|
|
+ # self.checkBox_cont_acq.setObjectName(_fromUtf8("checkBox_cont_acq"))
|
|
|
+ # self.verticalLayout_9.addWidget(self.checkBox_cont_acq)
|
|
|
|
|
|
self.pushButton_run = QtGui.QPushButton(self.centralwidget)
|
|
|
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
|
|
@@ -1195,7 +1202,8 @@ class Ui_MainWindow(object):
|
|
|
return str(self.lineEdit_file_path.text() + 'f' + self.lineEdit_fillnum.text() + '_' + filename_timestamp() + '_' + self.lineEdit_detector.text())
|
|
|
|
|
|
def readout_modulated():
|
|
|
- self.checkBox_cont_acq.setCheckState(0)
|
|
|
+ #self.checkBox_cont_acq.setCheckState(0)
|
|
|
+ #self.pushButton_run.setCheckState(0)
|
|
|
if self.checkBox_savefile.isChecked():
|
|
|
output_file = (get_filename() + '_m.bin')
|
|
|
else:
|
|
@@ -1224,7 +1232,8 @@ class Ui_MainWindow(object):
|
|
|
|
|
|
def readout_background():
|
|
|
global background_data
|
|
|
- self.checkBox_cont_acq.setCheckState(0)
|
|
|
+ #self.checkBox_cont_acq.setCheckState(0)
|
|
|
+ #self.pushButton_run.setCheckState(0)
|
|
|
if self.checkBox_savefile.isChecked():
|
|
|
output_file = (get_filename() + '_b.bin')
|
|
|
else:
|
|
@@ -1254,7 +1263,8 @@ class Ui_MainWindow(object):
|
|
|
|
|
|
def readout_unmodulated():
|
|
|
global unmodulated_data
|
|
|
- self.checkBox_cont_acq.setCheckState(0)
|
|
|
+ #self.checkBox_cont_acq.setCheckState(0)
|
|
|
+ #self.pushButton_run.setCheckState(0)
|
|
|
if self.checkBox_savefile.isChecked():
|
|
|
output_file = (get_filename() + '_u.bin')
|
|
|
else:
|
|
@@ -1384,7 +1394,8 @@ class Ui_MainWindow(object):
|
|
|
self.textEdit.insertPlainText(u'\u26A0' + ' Communication failed with FPGA board... Check FPGA, the PCI-Express connection and reboot')
|
|
|
else:
|
|
|
self.spinBox_int_time.setValue(read_int_time_value())
|
|
|
- self.spinBox_int_delay.setValue(read_int_delay_value())
|
|
|
+ self.spinBox_int_delay.setValue(read_register("INTEG_DELAY"))
|
|
|
+ #self.spinBox_int_delay.setValue(read_int_delay_value())
|
|
|
self.spinBox_gott_gain.setValue(read_register("GOTT_GAIN"))
|
|
|
self.spinBox_total_samples.setValue(read_register("FT_TO_ACQ"))
|
|
|
self.spinBox_skip_samples.setValue(read_register("FT_SKIP"))
|
|
@@ -1480,7 +1491,8 @@ class Ui_MainWindow(object):
|
|
|
|
|
|
# BUTTONS ACTIONS
|
|
|
self.spinBox_int_time.valueChanged.connect(lambda: write_int_time_value())
|
|
|
- self.spinBox_int_delay.valueChanged.connect(lambda: write_int_delay_value())
|
|
|
+ #self.spinBox_int_delay.valueChanged.connect(lambda: write_int_delay_value())
|
|
|
+ self.spinBox_gott_gain.valueChanged.connect(lambda: write_reg("INTEG_DELAY",self.spinBox_int_delay.text()))
|
|
|
self.spinBox_gott_gain.valueChanged.connect(lambda: write_reg("GOTT_GAIN",self.spinBox_gott_gain.text()))
|
|
|
self.spinBox_total_samples.valueChanged.connect(lambda: write_reg("FT_TO_ACQ",self.spinBox_total_samples.text()))
|
|
|
self.spinBox_skip_samples.valueChanged.connect(lambda: write_reg("FT_SKIP",self.spinBox_skip_samples.text()))
|
|
@@ -1505,7 +1517,7 @@ class Ui_MainWindow(object):
|
|
|
self.timer = pg.QtCore.QTimer()
|
|
|
#self.timer.timeout.connect(plot_waveform)
|
|
|
self.timer.timeout.connect(terminal_cmd_run)
|
|
|
- self.timer.timeout.connect(terminal_cmd_checkbox)
|
|
|
+ #self.timer.timeout.connect(terminal_cmd_checkbox)
|
|
|
self.timer.start(10)
|
|
|
|
|
|
self.retranslateUi(MainWindow)
|
|
@@ -1563,7 +1575,7 @@ class Ui_MainWindow(object):
|
|
|
|
|
|
self.label_acq.setText(_translate("MainWindow", "Acquire data", None))
|
|
|
self.label_acq.setFont(boldFont)
|
|
|
- self.checkBox_cont_acq.setText(_translate("MainWindow", "Live preview", None))
|
|
|
+ ##self.checkBox_cont_acq.setText(_translate("MainWindow", "Live preview", None))
|
|
|
# self.checkBox_ELOG.setText(_translate("MainWindow", "Create ELOG entry", None))
|
|
|
self.checkBox_savefile.setText(_translate("MainWindow", "Save File", None))
|
|
|
self.pushButton_modulated.setText(_translate("MainWindow", "Modulated", None))
|