kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Adding changes

Browse Source
This commit is contained in:
Johan K
2014-08-03 19:38:34 +02:00
parent b32b227733
commit 5cfdabb45a
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/InputField.cpp
View File

@@ -181,7 +181,7 @@ void InputField::newInput(const QString & text)
Quantity res;
try {
QString input = text;
input.remove(locale().groupSeparator());
fixup(input);
res = Quantity::parse(input);
}
catch(Base::Exception &e){
@@ -452,13 +452,14 @@ void InputField::selectNumber(void)
{
QByteArray str = text().toLatin1();
unsigned int i = 0;
Base::Console().Message("%i", locale().negativeSign().toAscii());
for (QByteArray::iterator it = str.begin(); it != str.end(); ++it) {
if (*it >= '0' && *it <= '9')
i++;
else if (*it == ',' || *it == '.')
i++;
else if (*it == '-')
else if (*it == '-' || *it == locale().negativeSign().toAscii())
i++;
else // any non-number character
break;
@@ -529,6 +530,10 @@ void InputField::wheelEvent (QWheelEvent * event)
void InputField::fixup(QString& input) const
{
input.remove(locale().groupSeparator());
if(locale().negativeSign() != QChar::fromAscii('-'))
input.replace(locale().negativeSign(), QChar::fromAscii('-'));
if(locale().positiveSign() != QChar::fromAscii('+'))
input.replace(locale().positiveSign(), QChar::fromAscii('+'));
}
QValidator::State InputField::validate(QString& input, int& pos) const
@@ -536,7 +541,7 @@ QValidator::State InputField::validate(QString& input, int& pos) const
try {
Quantity res;
QString text = input;
text.remove(locale().groupSeparator());
fixup(text);
res = Quantity::parse(text);
double factor;