From 781ecbf075ad5322eb55bc24ed75ca6d1116134d Mon Sep 17 00:00:00 2001
From: Lucio Zambon <lucio.zambon@elettra.eu>
Date: Thu, 23 Jan 2025 08:28:03 +0100
Subject: [PATCH] k6_k7
---
src/super.cpp | 25 +++++++++++++------
src/super.ui | 66 +++++++++++++++++++++++++--------------------------
2 files changed, 51 insertions(+), 40 deletions(-)
diff --git a/src/super.cpp b/src/super.cpp
index 63745ec..69866d8 100755
--- a/src/super.cpp
+++ b/src/super.cpp
@@ -1433,6 +1433,7 @@ super::super(QWidget *parent) : QWidget(parent)
ui.reset_premag->setTargets("k16/interlock/ethcmd_k16.01->PREMAG_RESTART");
ui.reset_piri->setTargets("k16/mod/rfamp_k16.01->ResetPiri");
ui.vacuumKly->setSource("k16/vacuum/sip08_k16.01/Current");
+ ui.vacuumKlyInt->setSource("k16/vacuum/sip08_k16.01/Pressure");
ui.KlyCollTemp->setSource("k16/interlock/flux_k16.01/KLYTemp");
ui.peakI->unsetSource(); ui.peakI->setText(" ");
ui.revI->unsetSource(); ui.revI->setText(" ");
@@ -2142,16 +2143,26 @@ super::super(QWidget *parent) : QWidget(parent)
ui.dequing_label->hide();
ui.dequing_state->hide();
if (!modNum.compare("06")) {
- ui.vacuumKly->setSource("kg06/vacuum/pssip_kg06.1/Current1");
- ui.vacuumKlyInt->setSource("kg06/vacuum/pssip_kg06.1/Pressure1");
+ ui.vacuumKly->setSource("k06/vacuum/sip_k06.1/Current");
+ ui.vacuumKlyInt->setSource("k06/vacuum/sip_k06.1/Pressure");
+ ui.vacuumKlyInt_label->setText("Kly Vac Pres");
+ ui.vacuumKlyInt_unit->setText("[mbar]");
}
else if (!modNum.compare("07")) {
- ui.vacuumKly->setSource("kg07/vacuum/pssip_kg07.17/Current1");
- ui.vacuumKlyInt->setSource("kg07/vacuum/pssip_kg07.17/Pressure1");
+ ui.vacuumKly->setSource("k07/vacuum/sip_k07.1/Current");
+ ui.vacuumKlyInt->setSource("k07/vacuum/sip_k07.1/Pressure");
+ ui.vacuumKlyInt_label->setText("Kly Vac Pres");
+ ui.vacuumKlyInt_unit->setText("[mbar]");
+ }
+ else if (!modNum.compare("16")) {
+ ui.vacuumKlyInt_label->setText("Kly Vac Pres");
+ ui.vacuumKlyInt_unit->setText("[mbar]");
}
else {
ui.vacuumKly->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressure");
ui.vacuumKlyInt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressureIntegrated");
+ ui.vacuumKlyInt_label->setText("Kly Vac Int");
+ ui.vacuumKlyInt_unit->setText("[A]");
}
if (!modNum.compare("sp") || !modNum.compare("s")) {
ui.vacuumKly->show();
@@ -2186,9 +2197,9 @@ super::super(QWidget *parent) : QWidget(parent)
ui.vacuumKly->show();
ui.vacuumKly_label->show();
ui.vacuumKly_unit->show();
- ui.vacuumKlyInt->hide();
- ui.vacuumKlyInt_label->hide();
- ui.vacuumKlyInt_unit->hide();
+ ui.vacuumKlyInt->show();
+ ui.vacuumKlyInt_label->show();
+ ui.vacuumKlyInt_unit->show();
ui.KlyCollTemp->show();
ui.KlyCollTemp_label->show();
ui.KlyCollTemp_unit->show();
diff --git a/src/super.ui b/src/super.ui
index a1ce830..80ad392 100755
--- a/src/super.ui
+++ b/src/super.ui
@@ -7696,7 +7696,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label_13">
<property name="geometry">
<rect>
- <x>200</x>
+ <x>190</x>
<y>133</y>
<width>110</width>
<height>20</height>
@@ -7704,7 +7704,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="font">
<font>
- <pointsize>12</pointsize>
+ <pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@@ -7716,7 +7716,7 @@ p, li { white-space: pre-wrap; }
<widget class="TLabel" name="KlyCollTemp">
<property name="geometry">
<rect>
- <x>310</x>
+ <x>297</x>
<y>10</y>
<width>117</width>
<height>28</height>
@@ -7739,7 +7739,7 @@ p, li { white-space: pre-wrap; }
<widget class="TLabel" name="revI">
<property name="geometry">
<rect>
- <x>310</x>
+ <x>297</x>
<y>171</y>
<width>117</width>
<height>28</height>
@@ -7762,7 +7762,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label_22">
<property name="geometry">
<rect>
- <x>200</x>
+ <x>190</x>
<y>173</y>
<width>110</width>
<height>21</height>
@@ -7770,7 +7770,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="font">
<font>
- <pointsize>12</pointsize>
+ <pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@@ -7782,7 +7782,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="vacuumKly_label">
<property name="geometry">
<rect>
- <x>200</x>
+ <x>190</x>
<y>53</y>
<width>110</width>
<height>20</height>
@@ -7790,7 +7790,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="font">
<font>
- <pointsize>12</pointsize>
+ <pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@@ -7802,7 +7802,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="KlyCollTemp_label">
<property name="geometry">
<rect>
- <x>202</x>
+ <x>192</x>
<y>13</y>
<width>110</width>
<height>21</height>
@@ -7810,7 +7810,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="font">
<font>
- <pointsize>12</pointsize>
+ <pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@@ -7822,7 +7822,7 @@ p, li { white-space: pre-wrap; }
<widget class="TLabel" name="vacuumKly">
<property name="geometry">
<rect>
- <x>310</x>
+ <x>297</x>
<y>50</y>
<width>117</width>
<height>28</height>
@@ -7868,7 +7868,7 @@ p, li { white-space: pre-wrap; }
<widget class="TTable" name="kly_vac_fault">
<property name="geometry">
<rect>
- <x>140</x>
+ <x>137</x>
<y>40</y>
<width>45</width>
<height>28</height>
@@ -7909,15 +7909,15 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label_27">
<property name="geometry">
<rect>
- <x>430</x>
+ <x>420</x>
<y>173</y>
- <width>21</width>
+ <width>40</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>7</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -7929,15 +7929,15 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="label_28">
<property name="geometry">
<rect>
- <x>430</x>
+ <x>420</x>
<y>133</y>
- <width>21</width>
+ <width>40</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>7</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -7949,15 +7949,15 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="vacuumKly_unit">
<property name="geometry">
<rect>
- <x>430</x>
+ <x>420</x>
<y>53</y>
- <width>21</width>
+ <width>40</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>7</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -7969,15 +7969,15 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="KlyCollTemp_unit">
<property name="geometry">
<rect>
- <x>430</x>
+ <x>420</x>
<y>13</y>
- <width>25</width>
+ <width>40</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>7</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -7986,14 +7986,14 @@ p, li { white-space: pre-wrap; }
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'DejaVu Sans'; font-size:7pt; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">[<span style=" vertical-align:super;">o</span>C]</p></body></html></string>
</property>
</widget>
<widget class="TLabel" name="vacuumKlyInt">
<property name="geometry">
<rect>
- <x>310</x>
+ <x>297</x>
<y>90</y>
<width>117</width>
<height>28</height>
@@ -8016,7 +8016,7 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="vacuumKlyInt_label">
<property name="geometry">
<rect>
- <x>200</x>
+ <x>190</x>
<y>93</y>
<width>110</width>
<height>20</height>
@@ -8024,7 +8024,7 @@ p, li { white-space: pre-wrap; }
</property>
<property name="font">
<font>
- <pointsize>12</pointsize>
+ <pointsize>11</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
@@ -8036,15 +8036,15 @@ p, li { white-space: pre-wrap; }
<widget class="QLabel" name="vacuumKlyInt_unit">
<property name="geometry">
<rect>
- <x>430</x>
+ <x>420</x>
<y>93</y>
- <width>21</width>
+ <width>40</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>7</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
@@ -8056,7 +8056,7 @@ p, li { white-space: pre-wrap; }
<widget class="MyLabel" name="peakI" native="true">
<property name="geometry">
<rect>
- <x>310</x>
+ <x>297</x>
<y>130</y>
<width>117</width>
<height>28</height>
@@ -8073,7 +8073,7 @@ p, li { white-space: pre-wrap; }
<rect>
<x>10</x>
<y>80</y>
- <width>180</width>
+ <width>171</width>
<height>140</height>
</rect>
</property>
--
GitLab