chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add maximum filter spinbox, menu item in waterfall, and proper controls for handling editing

Browse Source
This commit is contained in:
Jordan Sherer 2020-05-30 16:55:18 -04:00
parent f611072967
commit 1a92a23d2e
3 changed files with 110 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
widegraph.cpp
View File

@ -46,6 +46,13 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
ui->splitter->setCollapsible(ui->splitter->indexOf(ui->controls_widget), false);
ui->splitter->updateGeometry();
auto focusEater = new FocusEater(this);
connect(focusEater, &FocusEater::blurred, this, [this](QObject * /*obj*/){
setFilter(filterMinimum(), filterMaximum());
});
ui->filterMinSpinBox->installEventFilter(focusEater);
ui->filterMaxSpinBox->installEventFilter(focusEater);
auto filterEscapeEater = new KeyPressEater();
connect(filterEscapeEater, &KeyPressEater::keyPressed, this, [this](QObject */*obj*/, QKeyEvent *e, bool *pProcessed){
if(e->key() != Qt::Key_Escape){
@ -55,6 +62,7 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
if(pProcessed) *pProcessed=true;
});
ui->filterMinSpinBox->installEventFilter(filterEscapeEater);
ui->filterMaxSpinBox->installEventFilter(filterEscapeEater);
ui->widePlot->setCursor(Qt::CrossCursor);
ui->widePlot->setMaximumWidth(MAX_SCREENSIZE);
@ -104,6 +112,12 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
ui->filterCheckBox->setChecked(true);
});
auto maxAction = menu->addAction(QString("Set Filter Ma&ximum to %1 Hz").arg(f));
connect(maxAction, &QAction::triggered, this, [this, f](){
ui->filterMaxSpinBox->setValue(f);
ui->filterCheckBox->setChecked(true);
});
menu->popup(ui->widePlot->mapToGlobal(pos));
});
@ -117,6 +131,7 @@ WideGraph::WideGraph(QSettings * settings, QWidget *parent) :
emit qsy(hzDelta);
});
{
//Restore user's settings
@ -564,12 +579,12 @@ int WideGraph::Fmax() //Fmax
int WideGraph::filterMinimum()
{
return std::max(0, m_filterMinimum);
return std::max(0, std::min(m_filterMinimum, m_filterMaximum));
}
int WideGraph::filterMaximum()
{
return std::min(m_filterMaximum, 5000);
return std::min(std::max(m_filterMinimum, m_filterMaximum), 5000);
}
bool WideGraph::filterEnabled()
@ -579,7 +594,7 @@ bool WideGraph::filterEnabled()
void WideGraph::setFilterCenter(int n){
int delta = n - m_filterCenter;
setFilter(m_filterMinimum + delta, m_filterMaximum + delta);
setFilter(filterMinimum() + delta, filterMaximum() + delta);
}
void WideGraph::setFilter(int a, int b){
@ -587,26 +602,32 @@ void WideGraph::setFilter(int a, int b){
int high = std::max(a, b);
// ensure minimum filter width
if(high-low < m_filterMinWidth){
high = low + m_filterMinWidth;
}
// if(high-low < m_filterMinWidth){
// high = low + m_filterMinWidth;
// }
int width = high - low;
int center = low + width / 2;
// update the filter history
m_filterMinimum = low;
m_filterMaximum = high;
m_filterMinimum = a;
m_filterMaximum = b;
m_filterCenter = center;
// update the spinner UI
bool blocked = false;
blocked = ui->filterMinSpinBox->blockSignals(true);
{
ui->filterMinSpinBox->setValue(low);
ui->filterMinSpinBox->setValue(a);
}
ui->filterMinSpinBox->blockSignals(blocked);
blocked = ui->filterMaxSpinBox->blockSignals(true);
{
ui->filterMaxSpinBox->setValue(b);
}
ui->filterMaxSpinBox->blockSignals(blocked);
blocked = ui->filterCenterSpinBox->blockSignals(true);
{
ui->filterCenterSpinBox->setValue(center);
@ -627,7 +648,11 @@ void WideGraph::setFilter(int a, int b){
void WideGraph::setFilterMinimumBandwidth(int width){
m_filterMinWidth = width;
ui->filterWidthSpinBox->setMinimum(width);
setFilter(m_filterMinimum, std::max(m_filterMinimum+width, m_filterMaximum));
int low = filterMinimum();
int high = filterMaximum();
setFilter(low, std::max(low + width, high));
}
void WideGraph::setFilterEnabled(bool enabled){
@ -638,6 +663,7 @@ void WideGraph::setFilterEnabled(bool enabled){
ui->filterCenterSyncButton->setEnabled(enabled);
ui->filterWidthSpinBox->setEnabled(enabled);
ui->filterMinSpinBox->setEnabled(enabled);
ui->filterMaxSpinBox->setEnabled(enabled);
// update the checkbox ui
bool blocked = ui->filterCheckBox->blockSignals(true);
@ -928,8 +954,11 @@ void WideGraph::on_sbPercent2dPlot_valueChanged(int n)
}
void WideGraph::on_filterMinSpinBox_valueChanged(int n){
int delta = n - m_filterMinimum;
setFilter(m_filterMinimum + delta, m_filterMaximum + delta);
setFilter(n, m_filterMaximum);
}
void WideGraph::on_filterMaxSpinBox_valueChanged(int n){
setFilter(m_filterMinimum, n);
}
void WideGraph::on_filterCenterSpinBox_valueChanged(int n){

28
widegraph.h
View File

@ -8,6 +8,7 @@
#include <iostream>
#include <QDialog>
#include <QEvent>
#include <QScopedPointer>
#include <QDir>
#include <QHash>
@ -26,6 +27,32 @@ namespace Ui {
class QSettings;
class Configuration;
class FocusEater : public QObject
{
Q_OBJECT
public:
explicit FocusEater(QObject* parent = nullptr) : QObject(parent)
{
}
virtual bool eventFilter(QObject *obj, QEvent *event) override
{
Q_UNUSED(obj)
if (event->type() == QEvent::FocusIn){
emit focused(obj);
}
else if (event->type() == QEvent::FocusOut){
emit blurred(obj);
}
return false;
}
signals:
void focused(QObject *obj);
void blurred(QObject *obj);
};
class WideGraph : public QDialog
{
Q_OBJECT
@ -121,6 +148,7 @@ private slots:
void on_smoSpinBox_valueChanged(int n);
void on_sbPercent2dPlot_valueChanged(int n);
void on_filterMinSpinBox_valueChanged(int n);
void on_filterMaxSpinBox_valueChanged(int n);
void on_filterCenterSpinBox_valueChanged(int n);
void on_filterWidthSpinBox_valueChanged(int n);
void on_filterCenterSyncButton_clicked();

42
widegraph.ui
View File

@ -285,6 +285,9 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the software filter center in Hz. This filter prevents signals outside the filter range from being processed by the decoder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>2</horstretch>
@ -337,6 +340,9 @@
<property name="suffix">
<string> Hz</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the software filter width in Hz. This filter prevents signals outside the filter range from being processed by the decoder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="prefix">
<string>Width: </string>
</property>
@ -354,7 +360,7 @@
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the software filter width in Hz. This filter prevents signals outside the filter range from being processed by the decoder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the software filter minimum in Hz. This filter prevents signals outside the filter range from being processed by the decoder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::PlusMinus</enum>
@ -379,7 +385,39 @@
</property>
</widget>
</item>
</layout>
<item>
<widget class="QSpinBox" name="filterMaxSpinBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the software filter maximum in Hz. This filter prevents signals outside the filter range from being processed by the decoder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::PlusMinus</enum>
</property>
<property name="specialValueText">
<string/>
</property>
<property name="suffix">
<string> Hz</string>
</property>
<property name="prefix">
<string>Max: </string>
</property>
<property name="maximum">
<number>5000</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>500</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>