diff --git a/src/SluSourceMonitor.py b/src/SluSourceMonitor.py
index a21c423b286336b7d242b9b4a447d5c0c2063e7a..3e3beae72efe9883e8b387160c178b05b8dfd093 100644
--- a/src/SluSourceMonitor.py
+++ b/src/SluSourceMonitor.py
@@ -152,7 +152,7 @@ class MainWindow(QDialog):
lobeamline.addWidget(QLabel("Active beamline:"), 0, 4)
lobeamline.addWidget(self.beamlineattiva, 0, 5)
lobeamline.addWidget(QLabel("|"), 0, 6)
- lobeamline.addWidget(QLabel("switch to:"), 0, 7)
+ lobeamline.addWidget(QLabel("switch panel for:"), 0, 7)
lobeamline.addWidget(self.menubeamline, 0, 8)
lobeamline.addWidget(self.calendar, 0, 9)
lobeamline.addWidget(self.paginawiki, 0, 10)
@@ -181,12 +181,13 @@ class MainWindow(QDialog):
self.contienitab.addTab(self.tab7, "Temperature")
self.contienitab.addTab(self.tab8, "Log")
self.contienitab.addTab(self.tab5, "Delay")
-# self.contienitab.addTab(self.tab9, "Timer")
-# self.contienitab.addTab(self.tab10, "Timex")
-# self.contienitab.addTab(self.tab11, "DiProi")
- self.contienitab.addTab(self.tab12, "LDM")
+# self.contienitab.addTab(self.tab9, "Alarm thresholds")
+# self.contienitab.addTab(self.tab10, "Timer")
+# self.contienitab.addTab(self.tab11, "Timex")
+# self.contienitab.addTab(self.tab12, "DiProi")
+ self.contienitab.addTab(self.tab13, "LDM")
# self.contienitab.addTab(self.tab13, "MagneDyn")
-# self.contienitab.addTab(self.tab14, "Alarms")
+
lot1 = QGridLayout()
lot2 = QGridLayout()
lot3 = QGridLayout()
@@ -389,9 +390,9 @@ class MainWindow(QDialog):
self.deci1on2.clicked.connect(lambda: self.accendidecimatore('decima1', 'even'))
self.deci1off = QPushButton('OFF')
self.deci1off.clicked.connect(lambda: self.spegnidecimazione('decima1'))
- self.deci1delay = QPushButton('Set DELAY')
+ self.deci1delay = QPushButton('Set DELAY mode')
self.deci1delay.clicked.connect(lambda: self.decimadelay('decima1'))
- self.deci1status = QPushButton('Set STATUS')
+ self.deci1status = QPushButton('Set STATUS mode')
self.deci1status.clicked.connect(lambda: self.decimastatus('decima1'))
self.deci1sequence_R = LineEditRO()
self.deci1sequence_W = QLineEdit()
@@ -407,9 +408,9 @@ class MainWindow(QDialog):
self.deci2on2.clicked.connect(lambda: self.accendidecimatore('decima2', 'even'))
self.deci2off = QPushButton('OFF')
self.deci2off.clicked.connect(lambda: self.spegnidecimazione('decima2'))
- self.deci2delay = QPushButton('Set DELAY')
+ self.deci2delay = QPushButton('Set DELAY mode')
self.deci2delay.clicked.connect(lambda: self.decimadelay('decima2'))
- self.deci2status = QPushButton('Set STATUS')
+ self.deci2status = QPushButton('Set STATUS mode')
self.deci2status.clicked.connect(lambda: self.decimastatus('decima2'))
self.deci2sequence_R = LineEditRO()
self.deci2sequence_W = QLineEdit()
@@ -425,9 +426,9 @@ class MainWindow(QDialog):
self.deci3on2.clicked.connect(lambda: self.accendidecimatore('decima3', 'even'))
self.deci3off = QPushButton('OFF')
self.deci3off.clicked.connect(lambda: self.spegnidecimazione('decima3'))
- self.deci3delay = QPushButton('Set DELAY')
+ self.deci3delay = QPushButton('Set DELAY mode')
self.deci3delay.clicked.connect(lambda: self.decimadelay('decima3'))
- self.deci3status = QPushButton('Set STATUS')
+ self.deci3status = QPushButton('Set STATUS mode')
self.deci3status.clicked.connect(lambda: self.decimastatus('decima3'))
self.deci3sequence_R = LineEditRO()
self.deci3sequence_W = QLineEdit()
@@ -1047,104 +1048,95 @@ class MainWindow(QDialog):
lo_bottoni.addWidget(self.LDM_feedback1_state, 13, 1)
lo_bottoni.addWidget(self.LDM_feedback2, 14, 0)
lo_bottoni.addWidget(self.LDM_feedback2_state, 14, 1)
- lot12.addLayout(lo_bottoni, 0, 0, 11, 2)
- lot12.addWidget(QVLine(), 0, 2, 11, 1)
+ lot13.addLayout(lo_bottoni, 0, 0, 11, 2)
+ lot13.addWidget(QVLine(), 0, 2, 11, 1)
riga = 0
- lot12.addWidget(self.LDM_label_MOTOR, riga, 3)
+ lot13.addWidget(self.LDM_label_MOTOR, riga, 3)
riga +=1
- lot12.addWidget(self.LDM_rots1_b, riga, 3)
- lot12.addWidget(self.LDM_rots1_r, riga, 4)
- lot12.addWidget(self.LDM_rots1_w, riga, 5)
- lot12.addWidget(self.LDM_rots1_a, riga, 6)
- lot12.addWidget(self.LDM_rots1_relative, riga, 7, 1, 2)
+ lot13.addWidget(self.LDM_rots1_b, riga, 3)
+ lot13.addWidget(self.LDM_rots1_r, riga, 4)
+ lot13.addWidget(self.LDM_rots1_w, riga, 5)
+ lot13.addWidget(self.LDM_rots1_a, riga, 6)
+ lot13.addWidget(self.LDM_rots1_relative, riga, 7, 1, 2)
riga +=1
- lot12.addWidget(self.LDM_rots2_b, riga, 3)
- lot12.addWidget(self.LDM_rots2_r, riga, 4)
- lot12.addWidget(self.LDM_rots2_w, riga, 5)
- lot12.addWidget(self.LDM_rots2_a, riga, 6)
- lot12.addWidget(self.LDM_rots2_relative, riga, 7, 1, 2)
+ lot13.addWidget(self.LDM_rots2_b, riga, 3)
+ lot13.addWidget(self.LDM_rots2_r, riga, 4)
+ lot13.addWidget(self.LDM_rots2_w, riga, 5)
+ lot13.addWidget(self.LDM_rots2_a, riga, 6)
+ lot13.addWidget(self.LDM_rots2_relative, riga, 7, 1, 2)
riga +=1
- lot12.addWidget(self.LDM_rots3_b, riga, 3)
- lot12.addWidget(self.LDM_rots3_r, riga, 4)
- lot12.addWidget(self.LDM_rots3_w, riga, 5)
- lot12.addWidget(self.LDM_rots3_a, riga, 6)
- lot12.addWidget(self.LDM_rots3_relative, riga, 7, 1, 2)
+ lot13.addWidget(self.LDM_rots3_b, riga, 3)
+ lot13.addWidget(self.LDM_rots3_r, riga, 4)
+ lot13.addWidget(self.LDM_rots3_w, riga, 5)
+ lot13.addWidget(self.LDM_rots3_a, riga, 6)
+ lot13.addWidget(self.LDM_rots3_relative, riga, 7, 1, 2)
riga +=1
- lot12.addWidget(self.LDM_trls2_b, riga, 3)
- lot12.addWidget(self.LDM_trls2_r, riga, 4)
- lot12.addWidget(self.LDM_trls2_w, riga, 5)
- lot12.addWidget(self.LDM_trls2_a, riga, 6)
- lot12.addWidget(self.LDM_trls2_relative, riga, 7, 1, 2)
+ lot13.addWidget(self.LDM_trls2_b, riga, 3)
+ lot13.addWidget(self.LDM_trls2_r, riga, 4)
+ lot13.addWidget(self.LDM_trls2_w, riga, 5)
+ lot13.addWidget(self.LDM_trls2_a, riga, 6)
+ lot13.addWidget(self.LDM_trls2_relative, riga, 7, 1, 2)
riga +=1
- lot12.addWidget(self.LDM_kom1_b, riga, 3)
- lot12.addWidget(self.LDM_kom2_b, riga, 6)
+ lot13.addWidget(self.LDM_kom1_b, riga, 3)
+ lot13.addWidget(self.LDM_kom2_b, riga, 6)
# riga +=1
- lot12.addWidget(self.LDM_kom1_rx, riga, 4)
- lot12.addWidget(self.LDM_kom2_rx, riga, 7)
+ lot13.addWidget(self.LDM_kom1_rx, riga, 4)
+ lot13.addWidget(self.LDM_kom2_rx, riga, 7)
# riga +=1
- lot12.addWidget(self.LDM_kom1_ry, riga, 5)
- lot12.addWidget(self.LDM_kom2_ry, riga, 8)
+ lot13.addWidget(self.LDM_kom1_ry, riga, 5)
+ lot13.addWidget(self.LDM_kom2_ry, riga, 8)
riga +=1
- lot12.addWidget(self.LDM_kom1_rel, riga, 3, 5, 3)
- lot12.addWidget(self.LDM_kom2_rel, riga, 6, 5, 3)
- #9 timer
- #10 timex
- #11 diproi
- #12 ldm
- #13 magnedyn
- #14 alarm
- self.allarme_enablebeep = QCheckBox('Beep ON')
- self.allarme_test = QPushButton('Test')
- self.allarme_test.clicked.connect(self.provailbeep)
- self.allarme_source_amplifier_current = Riga_allarmi('Numero source_amplifier_current')
- self.allarme_source_amplifier_temperature = Riga_allarmi('Numero source_amplifier_temperature')
- self.allarme_source_amplifier_inputfb = Riga_allarmi('Numero source_amplifier_inputfb')
- self.allarme_source_amplifier_timefb = Riga_allarmi('Numero source_amplifier_timefb')
- self.allarme_source_launchenergy = Riga_allarmi('Numero source_launch_energy') #o amplifier energy?
- self.allarme_pointingfb = Riga_allarmi('Stato pointing_feedback')
- self.allarme_pointingtt1 = Riga_allarmi('Numero pointing_tt1')
- self.allarme_pointingtt2 = Riga_allarmi('Numero pointing_tt2')
- self.allarme_pointingtt3 = Riga_allarmi('Numero pointing_tt3')
- self.allarme_pointingtt4 = Riga_allarmi('Numero pointing_tt4')
- self.allarme_pointingtt5 = Riga_allarmi('Numero pointing_tt5')
- self.allarme_vacuumUH = Riga_allarmi('Numero vacuum_uh')
- self.allarme_vacuumtotem = Riga_allarmi('Numero vacuum_totem')
- self.allarme_vacuumbl = Riga_allarmi('Numero vacuum_bl')
- self.allarme_tempuhbb1 = Riga_allarmi('Numero temperature_uh_bb1')
- self.allarme_tempuhbb2 = Riga_allarmi('Numero temperature_uh_bb2')
- self.allarme_temptotemup = Riga_allarmi('Numero temperature_totem_up')
- self.allarme_temptotemdown = Riga_allarmi('Numero temperature_totem_down')
- self.allarme_tempibtmx = Riga_allarmi('Numero temperature_ib_tmx')
- self.allarme_tempibtmr = Riga_allarmi('Numero temperature_ib_tmr')
- self.allarme_tempibdpi = Riga_allarmi('Numero temperature_ib_dpi')
- self.allarme_tempibldm = Riga_allarmi('Numero temperature_ib_ldm')
- self.allarme_tempibmag = Riga_allarmi('Numero temperature_ib_mag')
- lot14.addWidget(self.allarme_enablebeep, 0, 0)
- lot14.addWidget(self.allarme_test, 0, 1)
- lot14.addWidget(self.allarme_source_amplifier_current, 10, 0)
- lot14.addWidget(self.allarme_source_amplifier_temperature, 11, 0)
- lot14.addWidget(self.allarme_source_amplifier_inputfb, 12, 0)
- lot14.addWidget(self.allarme_source_amplifier_timefb, 13, 0)
- lot14.addWidget(self.allarme_source_launchenergy, 14, 0)
- lot14.addWidget(self.allarme_pointingfb, 15, 0)
- lot14.addWidget(self.allarme_pointingtt1, 16, 0)
- lot14.addWidget(self.allarme_pointingtt2, 17, 0)
- lot14.addWidget(self.allarme_pointingtt3, 18, 0)
- lot14.addWidget(self.allarme_pointingtt4, 10, 1)
- lot14.addWidget(self.allarme_pointingtt5, 11, 1)
- lot14.addWidget(self.allarme_vacuumUH, 12, 1)
- lot14.addWidget(self.allarme_vacuumtotem, 13, 1)
- lot14.addWidget(self.allarme_vacuumbl, 14, 1)
- lot14.addWidget(self.allarme_tempuhbb1, 15, 1)
- lot14.addWidget(self.allarme_tempuhbb2, 16, 1)
- lot14.addWidget(self.allarme_temptotemup, 17, 1)
- lot14.addWidget(self.allarme_temptotemdown, 18, 1)
- lot14.addWidget(self.allarme_tempibtmx, 10, 2)
- lot14.addWidget(self.allarme_tempibtmr, 11, 2)
- lot14.addWidget(self.allarme_tempibdpi, 12, 2)
- lot14.addWidget(self.allarme_tempibldm, 13, 2)
- lot14.addWidget(self.allarme_tempibmag, 14, 2)
+ lot13.addWidget(self.LDM_kom1_rel, riga, 3, 5, 3)
+ lot13.addWidget(self.LDM_kom2_rel, riga, 6, 5, 3)
+ #10 timer
+ #11 timex
+ #12 diproi
+ #13 ldm
+ #14 magnedyn
+ #9 alarm
+ # solo read per allarmi generali
+ #allarmi configurabili da beamline
+ self.allarme_header = Riga_allarmi('', '', 'capello')
+ self.allarme_source_launchenergy = Riga_allarmi('Numero source_launch_energy', '', '') #o amplifier energy?
+ self.allarme_tempibtmr = Riga_allarmi('Numero temperature_ib_tmr', '', '')
+ self.allarme_tempibtmx = Riga_allarmi('Numero temperature_ib_tmx', '', '')
+ self.allarme_tempibdpi = Riga_allarmi('Numero temperature_ib_dpi', '', '')
+ self.allarme_tempibldm = Riga_allarmi('Numero temperature_ib_ldm', '', '')
+ self.allarme_tempibmag = Riga_allarmi('Numero temperature_ib_mag', '', '')
+ self.allarme_pointingfb = Riga_allarmi('Stato pointing_feedback', '', '')
+ self.allarme_std_SLUtrg = Riga_allarmi('Stato pointing_feedback', '', 'fisso')
+ self.allarme_pointingtt1 = Riga_allarmi('Numero pointing_tt1', '', 'fisso')
+ self.allarme_pointingtt2 = Riga_allarmi('Numero pointing_tt2', '', 'fisso')
+ self.allarme_pointingtt3 = Riga_allarmi('Numero pointing_tt3', '', 'fisso')
+ self.allarme_pointingtt4 = Riga_allarmi('Numero pointing_tt4', '', 'fisso')
+ self.allarme_pointingtt5 = Riga_allarmi('Numero pointing_tt5', '', 'fisso')
+ self.allarme_vacuumUH = Riga_allarmi('Numero vacuum_uh', '', 'fisso')
+ self.allarme_vacuumtotem = Riga_allarmi('Numero vacuum_totem', '', 'fisso')
+ self.allarme_vacuumbl = Riga_allarmi('Numero vacuum_bl', '', 'fisso')
+ self.allarme_tempuhbb1 = Riga_allarmi('Numero temperature_uh_bb1', '', 'fisso')
+ self.allarme_tempuhbb2 = Riga_allarmi('Numero temperature_uh_bb2', '', 'fisso')
+ self.allarme_temptotemup = Riga_allarmi('Numero temperature_totem_up', '', 'fisso')
+ self.allarme_temptotemdown = Riga_allarmi('Numero temperature_totem_down', '', 'fisso')
+ lot9.addWidget(self.allarme_header, 0, 0)
+ lot9.addWidget(self.allarme_source_launchenergy, 1, 0)
+ lot9.addWidget(self.allarme_tempibtmx, 2, 0)
+ lot9.addWidget(self.allarme_tempibtmr, 3, 0)
+ lot9.addWidget(self.allarme_tempibdpi, 4, 0)
+ lot9.addWidget(self.allarme_tempibldm, 5, 0)
+ lot9.addWidget(self.allarme_tempibmag, 6, 0)
+ lot9.addWidget(self.allarme_vacuumUH, 1, 1)
+ lot9.addWidget(self.allarme_vacuumtotem, 2, 1)
+ lot9.addWidget(self.allarme_vacuumbl, 3, 1)
+ lot9.addWidget(self.allarme_tempuhbb1, 4, 1)
+ lot9.addWidget(self.allarme_tempuhbb2, 5, 1)
+ lot9.addWidget(self.allarme_temptotemup, 6, 1)
+ lot9.addWidget(self.allarme_temptotemdown, 7, 1)
+ lot9.addWidget(self.allarme_pointingtt1, 1, 2)
+ lot9.addWidget(self.allarme_pointingtt2, 2, 2)
+ lot9.addWidget(self.allarme_pointingtt3, 3, 2)
+ lot9.addWidget(self.allarme_pointingtt4, 4, 2)
+ lot9.addWidget(self.allarme_pointingtt5, 5, 2)
### generale
loglobale = QGridLayout()
loglobale.addWidget(self.gruppobeamline, 0, 0)
@@ -1170,6 +1162,10 @@ class MainWindow(QDialog):
risposta_calendario = ''
self.beamlineattiva.setText(risposta_calendario)
self.linea = risposta_calendario
+ if self.linea == 'LDM':
+ self.tab13.show()
+ else:
+ self.tab13.hide()
####8 log
try:
risposta_archiviatore = sacco['archiviatore'].context
@@ -1856,38 +1852,38 @@ class MainWindow(QDialog):
try:
tmp = sacco['decimacheck'].read_attribute('ChannelsState')
if tmp.value[1] == 10 and tmp.value[2] == 10:
- self.deci1R.setText('Decimation ON - ' + mod1)
+ self.deci1R.setText('Decimation ON in ' + mod1 + ' mode')
self.deci1R.setStyleSheet("background-color: #00ff00")
- self.deci2R.setText('Decimation ON - ' + mod1)
+ self.deci2R.setText('Decimation ON ni ' + mod1 + ' mode')
self.deci2R.setStyleSheet("background-color: #00ff00")
- self.deci3R.setText('Decimation ON - ' + mod1)
+ self.deci3R.setText('Decimation ON in ' + mod1 + ' mode')
self.deci3R.setStyleSheet("background-color: #00ff00")
- self.monitor_decimation.setText('Global SEED+SLU ON - ' + mod1)
+ self.monitor_decimation.setText('Global SEED+SLU ON in ' + mod1 + ' mode')
self.monitor_decimation.setStyleSheet("background-color: #7777ff")
if tmp.value[1] == 10 and tmp.value[2] == 1 and tmp.value[10] == 10:
- self.deci1R.setText('Off - ' + mod1)
+ self.deci1R.setText('Off in ' + mod1 + ' mode')
self.deci1R.setStyleSheet("background-color: #ffffff")
- self.deci2R.setText('Decimation ON - ' + mod2)
+ self.deci2R.setText('Decimation ON in ' + mod2 + ' mode')
self.deci2R.setStyleSheet("background-color: #00ff00")
- self.deci3R.setText('Off - ' + mod3)
+ self.deci3R.setText('Off in ' + mod3 + ' mode')
self.deci3R.setStyleSheet("background-color: #ffffff")
- self.monitor_decimation.setText('SEED/FEL ON - ' + mod2)
+ self.monitor_decimation.setText('SEED/FEL ON in ' + mod2 + ' mode')
self.monitor_decimation.setStyleSheet("background-color: #7777ff")
if tmp.value[1] == 1 and tmp.value[2] == 10 and tmp.value[11] == 10:
- self.deci1R.setText('Off - ' + mod1)
+ self.deci1R.setText('Off in ' + mod1 + ' mode')
self.deci1R.setStyleSheet("background-color: #ffffff")
- self.deci2R.setText('Off - ' + mod2)
+ self.deci2R.setText('Off in ' + mod2 + ' mode')
self.deci2R.setStyleSheet("background-color: #ffffff")
- self.deci3R.setText('Decimation ON - ' + mod3)
+ self.deci3R.setText('Decimation ON in ' + mod3 + ' mode')
self.deci3R.setStyleSheet("background-color: #00ff00")
- self.monitor_decimation.setText('SLU ON - ' + mod3)
+ self.monitor_decimation.setText('SLU ON in ' + mod3 + ' mode')
self.monitor_decimation.setStyleSheet("background-color: #7777ff")
if tmp.value[1] == 1 and tmp.value[2] == 1 and tmp.value[11] == 1:
- self.deci1R.setText('Off - ' + mod1)
+ self.deci1R.setText('Off in ' + mod1 + ' mode')
self.deci1R.setStyleSheet("background-color: #ffffff")
- self.deci2R.setText('Off - ' + mod2)
+ self.deci2R.setText('Off in ' + mod2 + ' mode')
self.deci2R.setStyleSheet("background-color: #ffffff")
- self.deci3R.setText('Off - ' + mod3)
+ self.deci3R.setText('Off in ' + mod3 + ' mode')
self.deci3R.setStyleSheet("background-color: #ffffff")
self.monitor_decimation.setText('No decimation')
self.monitor_decimation.setStyleSheet("background-color: #00ff00")
@@ -1913,6 +1909,11 @@ class MainWindow(QDialog):
self.scope6M4R2.setText('std ' + str(round(tmp[7].value * 10**9, 1)) + ' ns')
self.scope6M5R2.setText('std ' + str(round(tmp[9].value * 10**9, 1)) + ' ns')
self.scope6M6R2.setText('std ' + str(round(tmp[11].value * 10**9, 1)) + ' ns')
+ if tmp[11].value * 10**9 > 1.5:
+ self.scope6M6R2.setStyleSheet("background-color: #ff0000")
+ self.somethingred += 1
+ else:
+ self.scope6M6R2.setStyleSheet("background-color: rgb(200, 200, 200)")
except:
self.scope6M1R1.setText('avg ... ns')
self.scope6M2R1.setText('avg ... ns')
@@ -2383,6 +2384,10 @@ class MainWindow(QDialog):
self.linea = nuovalinea
self.beamlineattiva.setText(str(self.linea))
self.autodeterminazionedeipupoli = 1
+ if self.linea == 'LDM':
+ self.tab13.show()
+ else:
+ self.tab13.hide()
def apripss(self):
os.system('/runtime/bin/laserpss -title Laser_safety_system &')
@@ -3299,7 +3304,7 @@ class MainWindow(QDialog):
stringattributo = 'Chan' + str(listaEVR1[kkk]) + 'Delay'
tmp = sacco["triggerSL"].read_attribute(stringattributo)
datidasalvare.append(str(tmp.value))
- nomidasalvare.append("EVR1 " + str(kkk))
+ nomidasalvare.append("EVR1 " + str(listaEVR1[kkk]))
if tmp.quality != 'ATTR_VALID':
altro = eval('sacco["triggerSL"].get_attribute_config_ex(stringattributo)')
if altro[0].alarms.min_alarm != str(float(tmp.value) - 1.0):
@@ -3311,8 +3316,8 @@ class MainWindow(QDialog):
for kkk in range(len(listaDGQ1)):
stringattributo = 'Chan' + str(listaDGQ1[kkk]) + 'Delay'
tmp = sacco["triggerDGQ1"].read_attribute(stringattributo)
- datidasalvare.append(str(tmp.value))
- nomidasalvare.append("DGQ1 " + str(kkk+1))
+ datidasalvare.append(str(tmp.value/10e8))
+ nomidasalvare.append("DGQ1 " + str(listaDGQ1[kkk]))
if tmp.quality != 'ATTR_VALID':
altro = eval('sacco["triggerDGQ1"].get_attribute_config_ex(stringattributo)')
if altro[0].alarms.min_alarm != str(float(tmp.value) - 1.0):
@@ -3324,7 +3329,7 @@ class MainWindow(QDialog):
stringattributo = 'Channel' + str(listaSDG1[kkk]) + 'Delay'
tmp = sacco["triggerSDG1"].read_attribute(stringattributo)
datidasalvare.append(str(tmp.value))
- nomidasalvare.append("SDG1 " + str(kkk+1))
+ nomidasalvare.append("SDG1 " + str(listaSDG1[kkk]))
if tmp.quality != 'ATTR_VALID':
altro = eval('sacco["triggerSDG1"].get_attribute_config_ex(stringattributo)')
if altro[0].alarms.min_alarm != str(float(tmp.value) - 1.0):
@@ -3336,7 +3341,7 @@ class MainWindow(QDialog):
stringattributo = 'Chan' + str(listaEVR2[kkk]) + 'Delay'
tmp = sacco["triggerSL2"].read_attribute(stringattributo)
datidasalvare.append(str(tmp.value))
- nomidasalvare.append("EVR2 " + str(kkk))
+ nomidasalvare.append("EVR2 " + str(listaEVR2[kkk]))
if tmp.quality != 'ATTR_VALID':
altro = eval('sacco["triggerSL2"].get_attribute_config_ex(stringattributo)')
if altro[0].alarms.min_alarm != str(float(tmp.value) - 1.0):
@@ -3347,8 +3352,8 @@ class MainWindow(QDialog):
for kkk in range(len(listaDGQ2)):
stringattributo = 'Chan' + str(listaDGQ2[kkk]) + 'Delay'
tmp = sacco["triggerDGQ2"].read_attribute(stringattributo)
- datidasalvare.append(str(tmp.value))
- nomidasalvare.append("DGQ2 " + str(kkk+1))
+ datidasalvare.append(str(tmp.value/10e8))
+ nomidasalvare.append("DGQ2 " + str(listaDGQ2[kkk]))
if tmp.quality != 'ATTR_VALID':
altro = eval('sacco["triggerDGQ2"].get_attribute_config_ex(stringattributo)')
if altro[0].alarms.min_alarm != str(float(tmp.value) - 1.0):
@@ -3360,7 +3365,7 @@ class MainWindow(QDialog):
stringattributo = 'Channel' + str(listaSDG2[kkk]) + 'Delay'
tmp = sacco["triggerSDG2"].read_attribute(stringattributo)
datidasalvare.append(str(tmp.value))
- nomidasalvare.append("SDG2 " + str(kkk+1))
+ nomidasalvare.append("SDG2 " + str(listaSDG2[kkk]))
if tmp.quality != 'ATTR_VALID':
altro = eval('sacco["triggerSDG2"].get_attribute_config_ex(stringattributo)')
if altro[0].alarms.min_alarm != str(float(tmp.value) - 1.0):
@@ -3666,10 +3671,6 @@ class MainWindow(QDialog):
gol = sacco['ldm_kom2'].Position_Y - float(self.LDM_kom2_rel.muoviPASSO.text())
sacco['ldm_kom2'].write_attribute('Position_Y', gol)
- def provailbeep(self):
- print('\007')
- print("\a")
-
def FUNZIONEVUOTA(self):
print('FUNZIONEVUOTA')
@@ -3703,28 +3704,66 @@ class movimentiacroce(QFrame):
self.setLayout(ilsuolayout)
class Riga_allarmi(QFrame):
- def __init__(self, stringa):
+ def __init__(self, stringa1, stringa2, stringa3):
super(Riga_allarmi, self).__init__()
- testo = stringa.replace('Stato','').replace('Numero','')
- self.cb = QCheckBox()
- self.label = QLabel(testo)
- self.low = QLineEdit()
- self.low.setReadOnly(1)
- self.low.setMaximumWidth(60)
- self.high = QLineEdit()
- self.high.setReadOnly(1)
- self.high.setMaximumWidth(60)
- self.change = QPushButton('Change limits')
- self.vabene = QPushButton('ack')
ilsuolayout = QHBoxLayout()
- ilsuolayout.addWidget(self.cb)
- ilsuolayout.addWidget(self.label)
- ilsuolayout.addWidget(self.low)
- ilsuolayout.addWidget(self.high)
- ilsuolayout.addWidget(self.change)
- ilsuolayout.addWidget(self.vabene)
+ if stringa3 == 'capello':
+ l1 = QLabel('Active')
+ l2 = QLabel('Subject')
+ l2.setFixedWidth(160)
+ l3 = QLabel('low')
+ l3.setFixedWidth(60)
+ l4 = QLabel('high')
+ l4.setFixedWidth(60)
+ l5 = QLabel('input')
+ l5.setFixedWidth(60)
+ ilsuolayout.addWidget(l1)
+ ilsuolayout.addWidget(l2)
+ ilsuolayout.addWidget(l3)
+ ilsuolayout.addWidget(l4)
+ ilsuolayout.addWidget(l5)
+ ilsuolayout.addWidget(QLabel(''))
+ ilsuolayout.addWidget(QLabel(''))
+ elif stringa3 == 'fisso':
+ testo = stringa1.replace('Stato','').replace('Numero','')
+ self.cb = QCheckBox()
+ self.cb.setFixedWidth(30)
+ self.label = QLabel(testo)
+ self.label.setFixedWidth(150)
+ self.low = LineEditRO()
+ self.low.setFixedWidth(60)
+ self.high = LineEditRO()
+ self.high.setFixedWidth(60)
+ ilsuolayout.addWidget(self.cb)
+ ilsuolayout.addWidget(self.label)
+ ilsuolayout.addWidget(self.low)
+ ilsuolayout.addWidget(self.high)
+ else:
+ testo = stringa1.replace('Stato','').replace('Numero','')
+ self.cb = QCheckBox()
+ self.cb.setFixedWidth(30)
+ self.label = QLabel(testo)
+ self.label.setFixedWidth(150)
+ self.low = LineEditRO()
+ self.low.setFixedWidth(60)
+ self.high = LineEditRO()
+ self.high.setFixedWidth(60)
+ self.nuovovalore = QLineEdit()
+ self.nuovovalore.setFixedWidth(60)
+ self.changelow = QPushButton('Change low')
+ self.changelow.setFixedWidth(80)
+ self.changehigh = QPushButton('Change high')
+ self.changehigh.setFixedWidth(80)
+ ilsuolayout.addWidget(self.cb)
+ ilsuolayout.addWidget(self.label)
+ ilsuolayout.addWidget(self.low)
+ ilsuolayout.addWidget(self.high)
+ ilsuolayout.addWidget(self.nuovovalore)
+ ilsuolayout.addWidget(self.changelow)
+ ilsuolayout.addWidget(self.changehigh)
self.setLayout(ilsuolayout)
+
class transport_fb_element(QFrame):
def __init__(self, stringa, nomeccd, nomett):
super(transport_fb_element, self).__init__()