combine autocorr, dirth functions

fix lfdemod bug
add askedge to overlays (remove askdemod)
This commit is contained in:
marshmellow42 2017-04-13 10:33:18 -04:00
commit c4f51073fc
11 changed files with 247 additions and 170 deletions

View file

@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget_overlays">
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<property name="focusPolicy">
@ -29,13 +29,6 @@
<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">
@ -43,6 +36,13 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Window size</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -78,8 +78,60 @@
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>Askdemod</string>
<string>AskEdge</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QFormLayout" name="formLayout_4">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Edge Jump Threshold</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_9">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_askedge">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>80</number>
</property>
<property name="value">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<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_2">
<attribute name="title">
@ -174,7 +226,7 @@
<item>
<widget class="QPushButton" name="pushButton_sticky">
<property name="text">
<string>Sticky</string>
<string>Restore</string>
</property>
</widget>
</item>
@ -194,7 +246,7 @@
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>TextLabel</string>
<string/>
</property>
</widget>
</item>
@ -211,8 +263,8 @@
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>29</x>
<y>90</y>
<x>46</x>
<y>118</y>
</hint>
<hint type="destinationlabel">
<x>597</x>
@ -227,8 +279,8 @@
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>153</x>
<y>84</y>
<x>170</x>
<y>118</y>
</hint>
<hint type="destinationlabel">
<x>161</x>
@ -243,8 +295,8 @@
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>53</x>
<y>92</y>
<x>70</x>
<y>118</y>
</hint>
<hint type="destinationlabel">
<x>68</x>
@ -259,8 +311,8 @@
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>184</x>
<y>161</y>
<x>201</x>
<y>185</y>
</hint>
<hint type="destinationlabel">
<x>149</x>
@ -268,5 +320,21 @@
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_askedge</sender>
<signal>valueChanged(int)</signal>
<receiver>label_9</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>149</x>
<y>102</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>70</y>
</hint>
</hints>
</connection>
</connections>
</ui>

View file

@ -1,13 +1,13 @@
/********************************************************************************
** Form generated from reading UI file 'overlaystQ7020.ui'
** Form generated from reading UI file 'overlays.ui'
**
** Created by: Qt User Interface Compiler version 4.8.6
** Created by: Qt User Interface Compiler version 5.6.1
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef OVERLAYSTQ7020_H
#define OVERLAYSTQ7020_H
#ifndef UI_OVERLAYS_H
#define UI_OVERLAYS_H
#include <QtCore/QVariant>
#include <QAction>
@ -34,11 +34,17 @@ public:
QWidget *tab;
QVBoxLayout *verticalLayout_2;
QFormLayout *formLayout;
QLabel *label;
QLabel *label_5;
QLabel *label;
QSlider *horizontalSlider_window;
QSpacerItem *verticalSpacer;
QWidget *tab_3;
QVBoxLayout *verticalLayout_4;
QFormLayout *formLayout_4;
QLabel *label_8;
QLabel *label_9;
QSlider *horizontalSlider_askedge;
QSpacerItem *verticalSpacer_3;
QWidget *tab_2;
QVBoxLayout *verticalLayout;
QFormLayout *formLayout_2;
@ -59,34 +65,34 @@ public:
void setupUi(QWidget *Form)
{
if (Form->objectName().isEmpty())
Form->setObjectName(QString::fromUtf8("Form"));
Form->setObjectName(QStringLiteral("Form"));
Form->resize(614, 286);
verticalLayout_3 = new QVBoxLayout(Form);
verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3"));
tabWidget_overlays = new QTabWidget(Form);
tabWidget_overlays->setObjectName(QString::fromUtf8("tabWidget_overlays"));
tabWidget_overlays->setObjectName(QStringLiteral("tabWidget_overlays"));
tab = new QWidget();
tab->setObjectName(QString::fromUtf8("tab"));
tab->setObjectName(QStringLiteral("tab"));
tab->setFocusPolicy(Qt::StrongFocus);
verticalLayout_2 = new QVBoxLayout(tab);
verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
verticalLayout_2->setObjectName(QStringLiteral("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);
formLayout->setObjectName(QStringLiteral("formLayout"));
label_5 = new QLabel(tab);
label_5->setObjectName(QString::fromUtf8("label_5"));
label_5->setObjectName(QStringLiteral("label_5"));
formLayout->setWidget(0, QFormLayout::FieldRole, label_5);
label = new QLabel(tab);
label->setObjectName(QStringLiteral("label"));
formLayout->setWidget(0, QFormLayout::LabelRole, label);
verticalLayout_2->addLayout(formLayout);
horizontalSlider_window = new QSlider(tab);
horizontalSlider_window->setObjectName(QString::fromUtf8("horizontalSlider_window"));
horizontalSlider_window->setObjectName(QStringLiteral("horizontalSlider_window"));
horizontalSlider_window->setMinimum(10);
horizontalSlider_window->setMaximum(10000);
horizontalSlider_window->setValue(2000);
@ -100,21 +106,52 @@ public:
tabWidget_overlays->addTab(tab, QString());
tab_3 = new QWidget();
tab_3->setObjectName(QString::fromUtf8("tab_3"));
tab_3->setObjectName(QStringLiteral("tab_3"));
verticalLayout_4 = new QVBoxLayout(tab_3);
verticalLayout_4->setObjectName(QStringLiteral("verticalLayout_4"));
formLayout_4 = new QFormLayout();
formLayout_4->setObjectName(QStringLiteral("formLayout_4"));
formLayout_4->setContentsMargins(-1, -1, -1, 0);
label_8 = new QLabel(tab_3);
label_8->setObjectName(QStringLiteral("label_8"));
formLayout_4->setWidget(0, QFormLayout::LabelRole, label_8);
label_9 = new QLabel(tab_3);
label_9->setObjectName(QStringLiteral("label_9"));
formLayout_4->setWidget(0, QFormLayout::FieldRole, label_9);
verticalLayout_4->addLayout(formLayout_4);
horizontalSlider_askedge = new QSlider(tab_3);
horizontalSlider_askedge->setObjectName(QStringLiteral("horizontalSlider_askedge"));
horizontalSlider_askedge->setMinimum(5);
horizontalSlider_askedge->setMaximum(80);
horizontalSlider_askedge->setValue(20);
horizontalSlider_askedge->setOrientation(Qt::Horizontal);
verticalLayout_4->addWidget(horizontalSlider_askedge);
verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
verticalLayout_4->addItem(verticalSpacer_3);
tabWidget_overlays->addTab(tab_3, QString());
tab_2 = new QWidget();
tab_2->setObjectName(QString::fromUtf8("tab_2"));
tab_2->setObjectName(QStringLiteral("tab_2"));
verticalLayout = new QVBoxLayout(tab_2);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
formLayout_2 = new QFormLayout();
formLayout_2->setObjectName(QString::fromUtf8("formLayout_2"));
formLayout_2->setObjectName(QStringLiteral("formLayout_2"));
label_2 = new QLabel(tab_2);
label_2->setObjectName(QString::fromUtf8("label_2"));
label_2->setObjectName(QStringLiteral("label_2"));
formLayout_2->setWidget(0, QFormLayout::LabelRole, label_2);
label_6 = new QLabel(tab_2);
label_6->setObjectName(QString::fromUtf8("label_6"));
label_6->setObjectName(QStringLiteral("label_6"));
formLayout_2->setWidget(0, QFormLayout::FieldRole, label_6);
@ -122,7 +159,7 @@ public:
verticalLayout->addLayout(formLayout_2);
horizontalSlider_dirthr_up = new QSlider(tab_2);
horizontalSlider_dirthr_up->setObjectName(QString::fromUtf8("horizontalSlider_dirthr_up"));
horizontalSlider_dirthr_up->setObjectName(QStringLiteral("horizontalSlider_dirthr_up"));
horizontalSlider_dirthr_up->setMaximum(128);
horizontalSlider_dirthr_up->setValue(20);
horizontalSlider_dirthr_up->setOrientation(Qt::Horizontal);
@ -130,14 +167,14 @@ public:
verticalLayout->addWidget(horizontalSlider_dirthr_up);
formLayout_3 = new QFormLayout();
formLayout_3->setObjectName(QString::fromUtf8("formLayout_3"));
formLayout_3->setObjectName(QStringLiteral("formLayout_3"));
label_3 = new QLabel(tab_2);
label_3->setObjectName(QString::fromUtf8("label_3"));
label_3->setObjectName(QStringLiteral("label_3"));
formLayout_3->setWidget(0, QFormLayout::LabelRole, label_3);
label_7 = new QLabel(tab_2);
label_7->setObjectName(QString::fromUtf8("label_7"));
label_7->setObjectName(QStringLiteral("label_7"));
formLayout_3->setWidget(0, QFormLayout::FieldRole, label_7);
@ -145,7 +182,7 @@ public:
verticalLayout->addLayout(formLayout_3);
horizontalSlider_dirthr_down = new QSlider(tab_2);
horizontalSlider_dirthr_down->setObjectName(QString::fromUtf8("horizontalSlider_dirthr_down"));
horizontalSlider_dirthr_down->setObjectName(QStringLiteral("horizontalSlider_dirthr_down"));
horizontalSlider_dirthr_down->setMaximum(127);
horizontalSlider_dirthr_down->setOrientation(Qt::Horizontal);
@ -160,14 +197,14 @@ public:
verticalLayout_3->addWidget(tabWidget_overlays);
horizontalLayout = new QHBoxLayout();
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
pushButton_apply = new QPushButton(Form);
pushButton_apply->setObjectName(QString::fromUtf8("pushButton_apply"));
pushButton_apply->setObjectName(QStringLiteral("pushButton_apply"));
horizontalLayout->addWidget(pushButton_apply);
pushButton_sticky = new QPushButton(Form);
pushButton_sticky->setObjectName(QString::fromUtf8("pushButton_sticky"));
pushButton_sticky->setObjectName(QStringLiteral("pushButton_sticky"));
horizontalLayout->addWidget(pushButton_sticky);
@ -176,7 +213,7 @@ public:
horizontalLayout->addItem(horizontalSpacer);
label_4 = new QLabel(Form);
label_4->setObjectName(QString::fromUtf8("label_4"));
label_4->setObjectName(QStringLiteral("label_4"));
horizontalLayout->addWidget(label_4);
@ -189,8 +226,9 @@ public:
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)));
QObject::connect(horizontalSlider_askedge, SIGNAL(valueChanged(int)), label_9, SLOT(setNum(int)));
tabWidget_overlays->setCurrentIndex(0);
tabWidget_overlays->setCurrentIndex(1);
QMetaObject::connectSlotsByName(Form);
@ -199,18 +237,20 @@ public:
void retranslateUi(QWidget *Form)
{
Form->setWindowTitle(QApplication::translate("Form", "Overlays", 0));
label->setText(QApplication::translate("Form", "Window size", 0));
label_5->setText(QString());
label->setText(QApplication::translate("Form", "Window size", 0));
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab), QApplication::translate("Form", "Autocorrelate", 0));
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "Askdemod", 0));
label_8->setText(QApplication::translate("Form", "Edge Jump Threshold", 0));
label_9->setText(QString());
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_3), QApplication::translate("Form", "AskEdge", 0));
label_2->setText(QApplication::translate("Form", "Up", 0));
label_6->setText(QString());
label_3->setText(QApplication::translate("Form", "Down", 0));
label_7->setText(QString());
tabWidget_overlays->setTabText(tabWidget_overlays->indexOf(tab_2), QApplication::translate("Form", "Dirthreshold", 0));
pushButton_apply->setText(QApplication::translate("Form", "Apply", 0));
pushButton_sticky->setText(QApplication::translate("Form", "Sticky", 0));
label_4->setText(QApplication::translate("Form", "TextLabel", 0));
pushButton_sticky->setText(QApplication::translate("Form", "Restore", 0));
label_4->setText(QString());
} // retranslateUi
};
@ -221,4 +261,4 @@ namespace Ui {
QT_END_NAMESPACE
#endif // OVERLAYSTQ7020_H
#endif // UI_OVERLAYS_H