ADD: starting merge @holiman 's graphic branch.

This commit is contained in:
iceman1001 2017-03-09 11:21:25 +01:00
parent be67483e63
commit 86fdf240e0
2 changed files with 496 additions and 0 deletions

272
client/ui/overlays.ui Normal file
View file

@ -0,0 +1,272 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Form</class>
<widget class="QWidget" name="Form">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>614</width>
<height>286</height>
</rect>
</property>
<property name="windowTitle">
<string>Overlays</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTabWidget" name="tabWidget_overlays">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<attribute name="title">
<string>Autocorrelate</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Window size</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_window">
<property name="minimum">
<number>10</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="value">
<number>2000</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>Askdemod</string>
</attribute>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Dirthreshold</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Up</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_dirthr_up">
<property name="maximum">
<number>128</number>
</property>
<property name="value">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Down</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_dirthr_down">
<property name="maximum">
<number>127</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_apply">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_sticky">
<property name="text">
<string>Sticky</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>horizontalSlider_window</sender>
<signal>valueChanged(int)</signal>
<receiver>label_4</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>29</x>
<y>90</y>
</hint>
<hint type="destinationlabel">
<x>597</x>
<y>257</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_window</sender>
<signal>valueChanged(int)</signal>
<receiver>label_5</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>153</x>
<y>84</y>
</hint>
<hint type="destinationlabel">
<x>161</x>
<y>69</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_dirthr_up</sender>
<signal>valueChanged(int)</signal>
<receiver>label_6</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>53</x>
<y>92</y>
</hint>
<hint type="destinationlabel">
<x>68</x>
<y>67</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_dirthr_down</sender>
<signal>valueChanged(int)</signal>
<receiver>label_7</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>184</x>
<y>161</y>
</hint>
<hint type="destinationlabel">
<x>149</x>
<y>135</y>
</hint>
</hints>
</connection>
</connections>
</ui>

224
client/ui/ui_overlays.h Normal file
View file

@ -0,0 +1,224 @@
/********************************************************************************
** Form generated from reading UI file 'overlaystQ7020.ui'
**
** Created by: Qt User Interface Compiler version 4.8.6
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef OVERLAYSTQ7020_H
#define OVERLAYSTQ7020_H
#include <QtCore/QVariant>
#include <QtGui/QAction>
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QFormLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QHeaderView>
#include <QtGui/QLabel>
#include <QtGui/QPushButton>
#include <QtGui/QSlider>
#include <QtGui/QSpacerItem>
#include <QtGui/QTabWidget>
#include <QtGui/QVBoxLayout>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class Ui_Form
{
public:
QVBoxLayout *verticalLayout_3;
QTabWidget *tabWidget_overlays;
QWidget *tab;
QVBoxLayout *verticalLayout_2;
QFormLayout *formLayout;
QLabel *label;
QLabel *label_5;
QSlider *horizontalSlider_window;
QSpacerItem *verticalSpacer;
QWidget *tab_3;
QWidget *tab_2;
QVBoxLayout *verticalLayout;
QFormLayout *formLayout_2;
QLabel *label_2;
QLabel *label_6;
QSlider *horizontalSlider_dirthr_up;
QFormLayout *formLayout_3;
QLabel *label_3;
QLabel *label_7;
QSlider *horizontalSlider_dirthr_down;
QSpacerItem *verticalSpacer_2;
QHBoxLayout *horizontalLayout;
QPushButton *pushButton_apply;
QPushButton *pushButton_sticky;
QSpacerItem *horizontalSpacer;
QLabel *label_4;
void setupUi(QWidget *Form)
{
if (Form->objectName().isEmpty())
Form->setObjectName(QString::fromUtf8("Form"));
Form->resize(614, 286);
verticalLayout_3 = new QVBoxLayout(Form);
verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
tabWidget_overlays = new QTabWidget(Form);
tabWidget_overlays->setObjectName(QString::fromUtf8("tabWidget_overlays"));
tab = new QWidget();
tab->setObjectName(QString::fromUtf8("tab"));
tab->setFocusPolicy(Qt::StrongFocus);
verticalLayout_2 = new QVBoxLayout(tab);
verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
formLayout = new QFormLayout();
formLayout->setObjectName(QString::fromUtf8("formLayout"));
label = new QLabel(tab);
label->setObjectName(QString::fromUtf8("label"));
formLayout->setWidget(0, QFormLayout::LabelRole, label);
label_5 = new QLabel(tab);
label_5->setObjectName(QString::fromUtf8("label_5"));
formLayout->setWidget(0, QFormLayout::FieldRole, label_5);
verticalLayout_2->addLayout(formLayout);
horizontalSlider_window = new QSlider(tab);
horizontalSlider_window->setObjectName(QString::fromUtf8("horizontalSlider_window"));
horizontalSlider_window->setMinimum(10);
horizontalSlider_window->setMaximum(10000);
horizontalSlider_window->setValue(2000);
horizontalSlider_window->setOrientation(Qt::Horizontal);
verticalLayout_2->addWidget(horizontalSlider_window);
verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalLayout_2->addItem(verticalSpacer);
tabWidget_overlays->addTab(tab, QString());
tab_3 = new QWidget();
tab_3->setObjectName(QString::fromUtf8("tab_3"));
tabWidget_overlays->addTab(tab_3, QString());
tab_2 = new QWidget();
tab_2->setObjectName(QString::fromUtf8("tab_2"));
verticalLayout = new QVBoxLayout(tab_2);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
formLayout_2 = new QFormLayout();
formLayout_2->setObjectName(QString::fromUtf8("formLayout_2"));
label_2 = new QLabel(tab_2);
label_2->setObjectName(QString::fromUtf8("label_2"));
formLayout_2->setWidget(0, QFormLayout::LabelRole, label_2);
label_6 = new QLabel(tab_2);
label_6->setObjectName(QString::fromUtf8("label_6"));
formLayout_2->setWidget(0, QFormLayout::FieldRole, label_6);
verticalLayout->addLayout(formLayout_2);
horizontalSlider_dirthr_up = new QSlider(tab_2);
horizontalSlider_dirthr_up->setObjectName(QString::fromUtf8("horizontalSlider_dirthr_up"));
horizontalSlider_dirthr_up->setMaximum(128);
horizontalSlider_dirthr_up->setValue(20);
horizontalSlider_dirthr_up->setOrientation(Qt::Horizontal);
verticalLayout->addWidget(horizontalSlider_dirthr_up);
formLayout_3 = new QFormLayout();
formLayout_3->setObjectName(QString::fromUtf8("formLayout_3"));
label_3 = new QLabel(tab_2);
label_3->setObjectName(QString::fromUtf8("label_3"));
formLayout_3->setWidget(0, QFormLayout::LabelRole, label_3);
label_7 = new QLabel(tab_2);
label_7->setObjectName(QString::fromUtf8("label_7"));
formLayout_3->setWidget(0, QFormLayout::FieldRole, label_7);
verticalLayout->addLayout(formLayout_3);
horizontalSlider_dirthr_down = new QSlider(tab_2);
horizontalSlider_dirthr_down->setObjectName(QString::fromUtf8("horizontalSlider_dirthr_down"));
horizontalSlider_dirthr_down->setMaximum(127);
horizontalSlider_dirthr_down->setOrientation(Qt::Horizontal);
verticalLayout->addWidget(horizontalSlider_dirthr_down);
verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalLayout->addItem(verticalSpacer_2);
tabWidget_overlays->addTab(tab_2, QString());
verticalLayout_3->addWidget(tabWidget_overlays);
horizontalLayout = new QHBoxLayout();
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
pushButton_apply = new QPushButton(Form);
pushButton_apply->setObjectName(QString::fromUtf8("pushButton_apply"));
horizontalLayout->addWidget(pushButton_apply);
pushButton_sticky = new QPushButton(Form);
pushButton_sticky->setObjectName(QString::fromUtf8("pushButton_sticky"));
horizontalLayout->addWidget(pushButton_sticky);
horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout->addItem(horizontalSpacer);
label_4 = new QLabel(Form);
label_4->setObjectName(QString::fromUtf8("label_4"));
horizontalLayout->addWidget(label_4);
verticalLayout_3->addLayout(horizontalLayout);
retranslateUi(Form);
QObject::connect(horizontalSlider_window, SIGNAL(valueChanged(int)), label_4, SLOT(setNum(int)));
QObject::connect(horizontalSlider_window, SIGNAL(valueChanged(int)), label_5, SLOT(setNum(int)));
QObject::connect(horizontalSlider_dirthr_up, SIGNAL(valueChanged(int)), label_6, SLOT(setNum(int)));
QObject::connect(horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), label_7, SLOT(setNum(int)));
tabWidget_overlays->setCurrentIndex(0);
QMetaObject::connectSlotsByName(Form);
} // setupUi
void retranslateUi(QWidget *Form)
{
Form->setWindowTitle(QApplication::translate("Form", "Overlays", 0, QApplication::UnicodeUTF8));
label->setText(QApplication::translate("Form", "Window size", 0, QApplication::UnicodeUTF8));
label_5->setText(QString());
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0, QApplication::UnicodeUTF8));
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "Askdemod", 0, QApplication::UnicodeUTF8));
label_2->setText(QApplication::translate("Form", "Up", 0, QApplication::UnicodeUTF8));
label_6->setText(QString());
label_3->setText(QApplication::translate("Form", "Down", 0, QApplication::UnicodeUTF8));
label_7->setText(QString());
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0, QApplication::UnicodeUTF8));
pushButton_apply->setText(QApplication::translate("Form", "Apply", 0, QApplication::UnicodeUTF8));
pushButton_sticky->setText(QApplication::translate("Form", "Sticky", 0, QApplication::UnicodeUTF8));
label_4->setText(QApplication::translate("Form", "TextLabel", 0, QApplication::UnicodeUTF8));
} // retranslateUi
};
namespace Ui {
class Form: public Ui_Form {};
} // namespace Ui
QT_END_NAMESPACE
#endif // OVERLAYSTQ7020_H