Commit 6382b8f4 authored by Gertulla, Janis Luca's avatar Gertulla, Janis Luca
Browse files

lab changes

parent 95f53c54
This diff is collapsed.
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
<widget class="QLabel" name="tDetLabel"> <widget class="QLabel" name="tDetLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>160</x>
<y>430</y> <y>430</y>
<width>60</width> <width>60</width>
<height>30</height> <height>30</height>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<widget class="QLabel" name="tDetValueLabel"> <widget class="QLabel" name="tDetValueLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>160</x> <x>170</x>
<y>450</y> <y>450</y>
<width>60</width> <width>60</width>
<height>30</height> <height>30</height>
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<widget class="QLabel" name="tDetRPMLabel"> <widget class="QLabel" name="tDetRPMLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>230</x> <x>240</x>
<y>450</y> <y>450</y>
<width>60</width> <width>60</width>
<height>30</height> <height>30</height>
...@@ -179,14 +179,14 @@ ...@@ -179,14 +179,14 @@
<widget class="QLabel" name="tDpsLabel"> <widget class="QLabel" name="tDpsLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>640</x> <x>490</x>
<y>60</y> <y>410</y>
<width>60</width> <width>60</width>
<height>30</height> <height>30</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>DPS:</string> <string>Grat:</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
...@@ -195,8 +195,8 @@ ...@@ -195,8 +195,8 @@
<widget class="QLabel" name="tDpsValueLabel"> <widget class="QLabel" name="tDpsValueLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>640</x> <x>490</x>
<y>80</y> <y>430</y>
<width>60</width> <width>60</width>
<height>30</height> <height>30</height>
</rect> </rect>
...@@ -211,8 +211,8 @@ ...@@ -211,8 +211,8 @@
<widget class="QLabel" name="tDpsRPMLabel"> <widget class="QLabel" name="tDpsRPMLabel">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>710</x> <x>560</x>
<y>80</y> <y>430</y>
<width>60</width> <width>60</width>
<height>30</height> <height>30</height>
</rect> </rect>
......
...@@ -9,7 +9,7 @@ SettingsTab::SettingsTab(QWidget *parent) : QWidget(parent), ui(std::make_unique ...@@ -9,7 +9,7 @@ SettingsTab::SettingsTab(QWidget *parent) : QWidget(parent), ui(std::make_unique
meas = std::make_unique<PlcMeasurement>(); meas = std::make_unique<PlcMeasurement>();
state = std::make_unique<PlcState>(); state = std::make_unique<PlcState>();
ui->unitsPressureUnitTypeComboBox->setCurrentIndex(2); ui->unitsPressureUnitTypeComboBox->setCurrentIndex(1);
settings = std::make_unique<QSettings>("Helmholtz-Zentrum Berlin", "UE49Interlock"); settings = std::make_unique<QSettings>("Helmholtz-Zentrum Berlin", "UE49Interlock");
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>192</string> <string>169</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>168</string> <string>254</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>171</string> <string>170</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
...@@ -253,6 +253,9 @@ ...@@ -253,6 +253,9 @@
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::ClickFocus</enum> <enum>Qt::ClickFocus</enum>
</property> </property>
<property name="currentIndex">
<number>1</number>
</property>
<property name="insertPolicy"> <property name="insertPolicy">
<enum>QComboBox::InsertAtCurrent</enum> <enum>QComboBox::InsertAtCurrent</enum>
</property> </property>
...@@ -432,6 +435,9 @@ ...@@ -432,6 +435,9 @@
<property name="focusPolicy"> <property name="focusPolicy">
<enum>Qt::ClickFocus</enum> <enum>Qt::ClickFocus</enum>
</property> </property>
<property name="currentIndex">
<number>3</number>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>PBR</string> <string>PBR</string>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
viewBox="0 0 1016 680" viewBox="0 0 1016 680"
version="1.1" version="1.1"
id="svg8" id="svg8"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)" inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="main.svg"> sodipodi:docname="main.svg">
<defs <defs
id="defs2"> id="defs2">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
units="px" units="px"
width="1024px" width="1024px"
inkscape:window-width="1920" inkscape:window-width="1920"
inkscape:window-height="1023" inkscape:window-height="1143"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="0" inkscape:window-y="0"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
...@@ -167,37 +167,44 @@ ...@@ -167,37 +167,44 @@
id="path1315" id="path1315"
d="M 560,201 V 70" d="M 560,201 V 70"
style="fill:none;stroke:#015a90;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1" /> style="fill:none;stroke:#015a90;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1" />
<path
id="path1317"
d="m 560,88.20857 h 60"
style="fill:none;stroke:#015a90;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1" />
<g <g
style="stroke:#015a90;stroke-width:2.5;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1" id="g40"
id="g1301-6" transform="rotate(90,387.5007,176.76178)">
transform="matrix(0,-0.8,0.8,0,249.60006,192.93472)">
<ellipse
ry="28.948053"
rx="28.947807"
transform="rotate(-2.4586185)"
cy="497.22849"
cx="110.00431"
id="path1253-7"
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<circle
transform="rotate(-2.4585972)"
r="13.656011"
cy="497.22845"
cx="110.00449"
id="path1255-5"
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
<path <path
id="path1281-3" style="fill:none;stroke:#015a90;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.67500019;stroke-dasharray:none;stroke-opacity:1"
d="m 146.80559,467.48984 7.95398,41.04643" d="m 560,88.20857 h 60"
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1" /> id="path1317"
<path inkscape:connector-curvature="0" />
id="path1283-5" <g
d="m 114.88481,468.29863 -7.65843,39.52335" transform="matrix(0,-0.8,0.8,0,249.60006,192.93472)"
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.675;stroke-dasharray:none;stroke-opacity:1" /> id="g1301-6"
style="stroke:#015a90;stroke-width:2.5;stroke-miterlimit:8.67500019;stroke-dasharray:none;stroke-opacity:1">
<ellipse
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:8.67500019;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
id="path1253-7"
cx="110.00431"
cy="497.22849"
transform="rotate(-2.4586185)"
rx="28.947807"
ry="28.948053" />
<circle
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:8.67500019;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
id="path1255-5"
cx="110.00449"
cy="497.22845"
r="13.656011"
transform="rotate(-2.4585972)" />
<path
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.67500019;stroke-dasharray:none;stroke-opacity:1"
d="m 146.80559,467.48984 7.95398,41.04643"
id="path1281-3"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#015a90;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.67500019;stroke-dasharray:none;stroke-opacity:1"
d="m 114.88481,468.29863 -7.65843,39.52335"
id="path1283-5"
inkscape:connector-curvature="0" />
</g>
</g> </g>
<path <path
style="fill:none;stroke:#015a90;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.675;stroke-dasharray:6, 2;stroke-dashoffset:0;stroke-opacity:1;marker-mid:url(#marker1207-3)" style="fill:none;stroke:#015a90;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:8.675;stroke-dasharray:6, 2;stroke-dashoffset:0;stroke-opacity:1;marker-mid:url(#marker1207-3)"
......
...@@ -94,14 +94,14 @@ void ValuesTab::onNewMeasurements(PlcMeasurement &msg) ...@@ -94,14 +94,14 @@ void ValuesTab::onNewMeasurements(PlcMeasurement &msg)
{ {
*meas = msg; *meas = msg;
QDateTime t = QDateTime::currentDateTime(); QDateTime t = QDateTime::currentDateTime();
pGratSeries->append(t.toMSecsSinceEpoch(), pressureFromReading(meas->pGrat, config->gaugeTypeGrat) * factorFromConfig(0)); //pGratSeries->append(t.toMSecsSinceEpoch(), pressureFromReading(meas->pGrat, config->gaugeTypeGrat) * factorFromConfig(0));
pMcpSeries->append(t.toMSecsSinceEpoch(), pressureFromReading(meas->pMcp, config->gaugeTypeMcp) * factorFromConfig(0)); //pMcpSeries->append(t.toMSecsSinceEpoch(), pressureFromReading(meas->pMcp, config->gaugeTypeMcp) * factorFromConfig(0));
pVvSeries->append(t.toMSecsSinceEpoch(), pressureFromReading(meas->pVv, config->gaugeTypeVv) * factorFromConfig(0)); //pVvSeries->append(t.toMSecsSinceEpoch(), pressureFromReading(meas->pVv, config->gaugeTypeVv) * factorFromConfig(0));
chart->axisX()->setRange( // chart->axisX()->setRange(
QDateTime::fromMSecsSinceEpoch(t.toMSecsSinceEpoch() - 100000), // QDateTime::fromMSecsSinceEpoch(t.toMSecsSinceEpoch() - 100000),
QDateTime::fromMSecsSinceEpoch(t.toMSecsSinceEpoch())); // QDateTime::fromMSecsSinceEpoch(t.toMSecsSinceEpoch()));
setValue(ui->pfeifferGratValueLabel, pressureFromReading(meas->pGrat, config->gaugeTypeGrat) * factorFromConfig(config->pressureUnitType)); setValue(ui->pfeifferGratValueLabel, pressureFromReading(meas->pGrat, config->gaugeTypeGrat) * factorFromConfig(config->pressureUnitType));
setValue(ui->pfeifferMcpValueLabel, pressureFromReading(meas->pMcp, config->gaugeTypeMcp) * factorFromConfig(config->pressureUnitType)); setValue(ui->pfeifferMcpValueLabel, pressureFromReading(meas->pMcp, config->gaugeTypeMcp) * factorFromConfig(config->pressureUnitType));
......
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
<rect> <rect>
<x>40</x> <x>40</x>
<y>0</y> <y>0</y>
<width>120</width> <width>161</width>
<height>30</height> <height>30</height>
</rect> </rect>
</property> </property>
...@@ -692,7 +692,7 @@ ...@@ -692,7 +692,7 @@
</font> </font>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="MainTab" name="main"> <widget class="MainTab" name="main">
<property name="sizePolicy"> <property name="sizePolicy">
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Window</class>
<widget class="QMainWindow" name="Window">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1024</width>
<height>768</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>229</red>
<green>229</green>
<blue>229</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Highlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="HighlightedText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Link">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="LinkVisited">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="AlternateBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipBase">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="ToolTipText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Light">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Midlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Dark">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Mid">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Text">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>229</red>
<green>229</green>
<blue>229</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Shadow">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="Highlight">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="HighlightedText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>