From 784ed23886b7fc59ea78c586443cf3e3029794ef Mon Sep 17 00:00:00 2001
From: "paolo.cinquegrana@elettra.eu" <paolo.cinquegrana@elettra.eu>
Date: Wed, 7 Jun 2023 18:07:44 +0200
Subject: [PATCH] modificata gestione layout tab active beamline
---
src/SluSourceMonitor.py | 160 ++++++++++++++++++++--------------------
1 file changed, 80 insertions(+), 80 deletions(-)
diff --git a/src/SluSourceMonitor.py b/src/SluSourceMonitor.py
index aaff6ce..f89d3ad 100644
--- a/src/SluSourceMonitor.py
+++ b/src/SluSourceMonitor.py
@@ -187,7 +187,7 @@ class MainWindow(QDialog):
# self.contienitab.addTab(self.tab12, "DiProi")
self.contienitab.addTab(self.tab13, "LDM")
# self.contienitab.addTab(self.tab13, "MagneDyn")
-
+ self.lot0 = QGridLayout()
lot1 = QGridLayout()
lot2 = QGridLayout()
lot3 = QGridLayout()
@@ -200,7 +200,7 @@ class MainWindow(QDialog):
lot10 = QGridLayout()
lot11 = QGridLayout()
lot12 = QGridLayout()
- lot13 = QGridLayout()
+ self.lot13 = QGridLayout()
lot14 = QGridLayout()
self.tab1.setLayout(lot1)
self.tab2.setLayout(lot2)
@@ -214,7 +214,7 @@ class MainWindow(QDialog):
self.tab10.setLayout(lot10)
self.tab11.setLayout(lot11)
self.tab12.setLayout(lot12)
- self.tab13.setLayout(lot13)
+ self.tab13.setLayout(self.lot13)
self.tab14.setLayout(lot14)
#1 monitor
self.monitor_amplilabel = QLabel("Source")
@@ -1048,47 +1048,47 @@ 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)
- lot13.addLayout(lo_bottoni, 0, 0, 11, 2)
- lot13.addWidget(QVLine(), 0, 2, 11, 1)
+ self.lot13.addLayout(lo_bottoni, 0, 0, 11, 2)
+ self.lot13.addWidget(QVLine(), 0, 2, 11, 1)
riga = 0
- lot13.addWidget(self.LDM_label_MOTOR, riga, 3)
+ self.lot13.addWidget(self.LDM_label_MOTOR, riga, 3)
riga +=1
- 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)
+ self.lot13.addWidget(self.LDM_rots1_b, riga, 3)
+ self.lot13.addWidget(self.LDM_rots1_r, riga, 4)
+ self.lot13.addWidget(self.LDM_rots1_w, riga, 5)
+ self.lot13.addWidget(self.LDM_rots1_a, riga, 6)
+ self.lot13.addWidget(self.LDM_rots1_relative, riga, 7, 1, 2)
riga +=1
- 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)
+ self.lot13.addWidget(self.LDM_rots2_b, riga, 3)
+ self.lot13.addWidget(self.LDM_rots2_r, riga, 4)
+ self.lot13.addWidget(self.LDM_rots2_w, riga, 5)
+ self.lot13.addWidget(self.LDM_rots2_a, riga, 6)
+ self.lot13.addWidget(self.LDM_rots2_relative, riga, 7, 1, 2)
riga +=1
- 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)
+ self.lot13.addWidget(self.LDM_rots3_b, riga, 3)
+ self.lot13.addWidget(self.LDM_rots3_r, riga, 4)
+ self.lot13.addWidget(self.LDM_rots3_w, riga, 5)
+ self.lot13.addWidget(self.LDM_rots3_a, riga, 6)
+ self.lot13.addWidget(self.LDM_rots3_relative, riga, 7, 1, 2)
riga +=1
- 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)
+ self.lot13.addWidget(self.LDM_trls2_b, riga, 3)
+ self.lot13.addWidget(self.LDM_trls2_r, riga, 4)
+ self.lot13.addWidget(self.LDM_trls2_w, riga, 5)
+ self.lot13.addWidget(self.LDM_trls2_a, riga, 6)
+ self.lot13.addWidget(self.LDM_trls2_relative, riga, 7, 1, 2)
riga +=1
- lot13.addWidget(self.LDM_kom1_b, riga, 3)
- lot13.addWidget(self.LDM_kom2_b, riga, 6)
+ self.lot13.addWidget(self.LDM_kom1_b, riga, 3)
+ self.lot13.addWidget(self.LDM_kom2_b, riga, 6)
# riga +=1
- lot13.addWidget(self.LDM_kom1_rx, riga, 4)
- lot13.addWidget(self.LDM_kom2_rx, riga, 7)
+ self.lot13.addWidget(self.LDM_kom1_rx, riga, 4)
+ self.lot13.addWidget(self.LDM_kom2_rx, riga, 7)
# riga +=1
- lot13.addWidget(self.LDM_kom1_ry, riga, 5)
- lot13.addWidget(self.LDM_kom2_ry, riga, 8)
+ self.lot13.addWidget(self.LDM_kom1_ry, riga, 5)
+ self.lot13.addWidget(self.LDM_kom2_ry, riga, 8)
riga +=1
- lot13.addWidget(self.LDM_kom1_rel, riga, 3, 5, 3)
- lot13.addWidget(self.LDM_kom2_rel, riga, 6, 5, 3)
+ self.lot13.addWidget(self.LDM_kom1_rel, riga, 3, 5, 3)
+ self.lot13.addWidget(self.LDM_kom2_rel, riga, 6, 5, 3)
#10 timer
#11 timex
#12 diproi
@@ -1162,10 +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()
+ if self.linea == 'LDM':
+ self.tab13.setEnabled(1)
+ else:
+ self.tab13.setEnabled(0)
####8 log
try:
risposta_archiviatore = sacco['archiviatore'].context
@@ -2331,44 +2331,44 @@ class MainWindow(QDialog):
self.monitor_vacuum.setStyleSheet("background-color: rgb(0, 255, 0)")
self.contienitab.setTabText(4, "Vacuum")
####12 ldm
-# if self.contienitab.currentIndex() == 8:
- try:
- tmp = sacco['ldm_kom1'].read_attributes(['Position_X', 'Position_Y'])
- self.LDM_kom1_rx.setText(str(round(tmp[0].value, 4)))
- self.LDM_kom1_ry.setText(str(round(tmp[1].value, 4)))
- except:
- self.LDM_kom1_rx.setText('#####')
- self.LDM_kom1_ry.setText('#####')
- try:
- tmp = sacco['ldm_kom2'].read_attributes(['Position_X', 'Position_Y'])
- self.LDM_kom2_rx.setText(str(round(tmp[0].value, 4)))
- except:
- self.LDM_kom2_rx.setText('#####')
- self.LDM_kom2_ry.setText('#####')
- try:
- self.LDM_rots1_r.setText(str(round(sacco['ldm_rots1'].UserPosition, 3)))
- except:
- self.LDM_rots1_r.setText('#####')
- try:
- self.LDM_rots2_r.setText(str(round(sacco['ldm_rots2'].UserPosition, 3)))
- except:
- self.LDM_rots2_r.setText('#####')
- try:
- self.LDM_rots3_r.setText(str(round(sacco['ldm_rots3'].UserPosition, 3)))
- except:
- self.LDM_rots3_r.setText('#####')
- try:
- self.LDM_trls2_r.setText(str(round(sacco['ldm_trls2'].UserPosition, 3)))
- except:
- self.LDM_trls2_r.setText('#####')
- try:
- self.LDM_feedback1_state.setText(str(sacco['ldm_fb1'].State()))
- except:
- self.LDM_feedback1_state.setText('#####')
- try:
- self.LDM_feedback2_state.setText(str(sacco['ldm_fb2'].State()))
- except:
- self.LDM_feedback2_state.setText('#####')
+ if self.contienitab.currentIndex() == 8:
+ try:
+ tmp = sacco['ldm_kom1'].read_attributes(['Position_X', 'Position_Y'])
+ self.LDM_kom1_rx.setText(str(round(tmp[0].value, 4)))
+ self.LDM_kom1_ry.setText(str(round(tmp[1].value, 4)))
+ except:
+ self.LDM_kom1_rx.setText('#####')
+ self.LDM_kom1_ry.setText('#####')
+ try:
+ tmp = sacco['ldm_kom2'].read_attributes(['Position_X', 'Position_Y'])
+ self.LDM_kom2_rx.setText(str(round(tmp[0].value, 4)))
+ except:
+ self.LDM_kom2_rx.setText('#####')
+ self.LDM_kom2_ry.setText('#####')
+ try:
+ self.LDM_rots1_r.setText(str(round(sacco['ldm_rots1'].UserPosition, 3)))
+ except:
+ self.LDM_rots1_r.setText('#####')
+ try:
+ self.LDM_rots2_r.setText(str(round(sacco['ldm_rots2'].UserPosition, 3)))
+ except:
+ self.LDM_rots2_r.setText('#####')
+ try:
+ self.LDM_rots3_r.setText(str(round(sacco['ldm_rots3'].UserPosition, 3)))
+ except:
+ self.LDM_rots3_r.setText('#####')
+ try:
+ self.LDM_trls2_r.setText(str(round(sacco['ldm_trls2'].UserPosition, 3)))
+ except:
+ self.LDM_trls2_r.setText('#####')
+ try:
+ self.LDM_feedback1_state.setText(str(sacco['ldm_fb1'].State()))
+ except:
+ self.LDM_feedback1_state.setText('#####')
+ try:
+ self.LDM_feedback2_state.setText(str(sacco['ldm_fb2'].State()))
+ except:
+ self.LDM_feedback2_state.setText('#####')
if self.somethingred != 0:
self.globallarm.setText('Alarm ON')
self.globallarm.setStyleSheet("background-color: rgb(255, 0, 0)")
@@ -2384,10 +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()
+ if self.linea == 'LDM':
+ self.tab13.show()
+ else:
+ self.tab13.hide()
def apripss(self):
os.system('/runtime/bin/laserpss -title Laser_safety_system &')
--
GitLab