mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2026-07-23 02:24:27 -04:00
Improve frequency input validation
Allow group separators as well as decimal points in MHz input fields git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7462 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
+34
-4
@@ -1,16 +1,45 @@
|
||||
#include "FrequencyLineEdit.hpp"
|
||||
|
||||
#include <QRegExpValidator>
|
||||
#include <QRegExp>
|
||||
#include <limits>
|
||||
|
||||
#include <QDoubleValidator>
|
||||
#include <QString>
|
||||
#include <QLocale>
|
||||
|
||||
#include "moc_FrequencyLineEdit.cpp"
|
||||
|
||||
namespace
|
||||
{
|
||||
class MHzValidator
|
||||
: public QDoubleValidator
|
||||
{
|
||||
public:
|
||||
MHzValidator (double bottom, double top, QObject * parent = nullptr)
|
||||
: QDoubleValidator {bottom, top, 6, parent}
|
||||
{
|
||||
}
|
||||
|
||||
State validate (QString& input, int& pos) const override
|
||||
{
|
||||
State result = QDoubleValidator::validate (input, pos);
|
||||
if (Acceptable == result)
|
||||
{
|
||||
bool ok;
|
||||
(void)QLocale {}.toDouble (input, &ok);
|
||||
if (!ok)
|
||||
{
|
||||
result = Intermediate;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
FrequencyLineEdit::FrequencyLineEdit (QWidget * parent)
|
||||
: QLineEdit (parent)
|
||||
{
|
||||
setValidator (new QRegExpValidator {QRegExp {QString {R"(\d{0,6}(\)"} + QLocale {}.decimalPoint () + R"(\d{0,6})?)"}, this});
|
||||
setValidator (new MHzValidator {0., std::numeric_limits<Radio::Frequency>::max () / 10.e6, this});
|
||||
}
|
||||
|
||||
auto FrequencyLineEdit::frequency () const -> Frequency
|
||||
@@ -27,7 +56,8 @@ void FrequencyLineEdit::frequency (Frequency f)
|
||||
FrequencyDeltaLineEdit::FrequencyDeltaLineEdit (QWidget * parent)
|
||||
: QLineEdit (parent)
|
||||
{
|
||||
setValidator (new QRegExpValidator {QRegExp {QString {R"(-?\d{0,6}(\)"} + QLocale {}.decimalPoint () + R"(\d{0,6})?)"}, this});
|
||||
setValidator (new MHzValidator {-std::numeric_limits<FrequencyDelta>::max () / 10.e6,
|
||||
std::numeric_limits<FrequencyDelta>::max () / 10.e6, this});
|
||||
}
|
||||
|
||||
auto FrequencyDeltaLineEdit::frequency_delta () const -> FrequencyDelta
|
||||
|
||||
Reference in New Issue
Block a user