Skip to content

GitLab

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

hvmcp changes etc

parent ccb178be
Expand all Hide whitespace changes
Inline Side-by-side
UE49Interlock.pro
View file @ d6ae6c44
QT += core gui network charts
greaterThan(QT_MAJOR_VERSION, 5): QT += widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++17
......
UE49Interlock.pro.user
View file @ d6ae6c44
This diff is collapsed.
UE49Interlock.pro.user.9501c15.20 0 → 100644
View file @ d6ae6c44
This diff is collapsed.
lib.h
View file @ d6ae6c44
......@@ -2,6 +2,7 @@
#define LIB_H
#include <QtCore>
#include <QLabel>
#include <memory>
enum MsgType
{
......
maintab.cpp
View file @ d6ae6c44
......@@ -82,7 +82,7 @@ void MainTab::onNewState(PlcState &msg)
{
*state = msg;
ui->linkButton->setText(msg.linked ? "X" : "| |");
ui->hvmcpState->setPixmap(state->hvmcpHigh ? *pHvActive : *pHvInactive);
ui->hvmcpState->setPixmap(!(state->hvmcpHigh) ? *pHvActive : *pHvInactive);
ui->rBeamlineStateLabel->setPixmap(state->rbeamlineHigh ? *pHvActive : *pHvInactive);
ui->pumpRunningLabel->setText(state->pumpEnabled ? "RUNNING" : "STOPPED");
ui->pumpStartButton->setText(state->pumpEnabled ? "STOP" : "START");
......
maintab.ui
View file @ d6ae6c44
......@@ -134,7 +134,7 @@
<widget class="QLabel" name="tDetLabel">
<property name="geometry">
<rect>
<x>150</x>
<x>160</x>
<y>430</y>
<width>60</width>
<height>30</height>
......@@ -179,7 +179,7 @@
<widget class="QLabel" name="tDpsLabel">
<property name="geometry">
<rect>
<x>640</x>
<x>650</x>
<y>60</y>
<width>60</width>
<height>30</height>
......
settingstab.ui
View file @ d6ae6c44
......@@ -67,7 +67,7 @@
</rect>
</property>
<property name="text">
<string>192</string>
<string>169</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
......@@ -99,7 +99,7 @@
</rect>
</property>
<property name="text">
<string>168</string>
<string>254</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
......@@ -115,7 +115,7 @@
</rect>
</property>
<property name="text">
<string>171</string>
<string>170</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
......@@ -253,6 +253,9 @@
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<property name="insertPolicy">
<enum>QComboBox::InsertAtCurrent</enum>
</property>
......@@ -432,6 +435,9 @@
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="currentIndex">
<number>3</number>
</property>
<item>
<property name="text">
<string>PBR</string>
......
window.cpp
View file @ d6ae6c44
......@@ -92,7 +92,7 @@ void Window::onSystembarOverrideButtonClicked()
newState.override = !newState.override;
if(newState.override){
bool ok;
auto input = QInputDialog::getText(this, tr("Override Password"), tr("password:"), QLineEdit::Normal, "", &ok);
auto input = QInputDialog::getText(this, tr("Override Password"), tr("password:"), QLineEdit::Password, "", &ok);
if(ok)
{
if(input == "Grace4"){
......
window.ui
View file @ d6ae6c44
......@@ -563,7 +563,7 @@
<rect>
<x>40</x>
<y>0</y>
<width>120</width>
<width>161</width>
<height>30</height>
</rect>
</property>
......@@ -692,7 +692,7 @@
</font>
</property>
<property name="currentIndex">
<number>1</number>
<number>0</number>
</property>
<widget class="MainTab" name="main">
<property name="sizePolicy">
......
window.ui.autosave deleted 100644 → 0
View file @ ccb178be
<?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>
<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>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</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>51</red>
<green>51</green>
<blue>51</blue>
</color>
</brush>
</colorrole>
<colorrole role="ButtonText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>51</red>
<green>51</green>
<blue>51</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>225</red>
<green>225</green>
<blue>225</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>