sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues with to_interval expression function

Browse Source 
- incorrect regex for handling values with decimal point
- fix overflow with large intervals
This commit is contained in:
Nyall Dawson 2017-12-21 22:29:00 +10:00
parent d908518c49
commit e02ff050ad
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgsinterval.cpp
View File

@ -44,8 +44,8 @@ bool QgsInterval::operator==( QgsInterval other ) const
QgsInterval QgsInterval::fromString( const QString &string )
{
int seconds = 0;
QRegExp rx( "([-+]?\\d?\\.?\\d+\\s+\\S+)", Qt::CaseInsensitive );
double seconds = 0;
QRegExp rx( "([-+]?\\d*\\.?\\d+\\s+\\S+)", Qt::CaseInsensitive );
QStringList list;
int pos = 0;

6
tests/src/python/test_qgsinterval.py
View File

@ -118,6 +118,9 @@ class TestQgsInterval(unittest.TestCase):
i = QgsInterval.fromString('2 Years')
self.assertTrue(i.isValid())
self.assertEqual(i.years(), 2)
i = QgsInterval.fromString('20000 Years')
self.assertTrue(i.isValid())
self.assertEqual(i.years(), 20000)
i = QgsInterval.fromString('30 month')
self.assertTrue(i.isValid())
self.assertEqual(i.months(), 30)
@ -133,6 +136,9 @@ class TestQgsInterval(unittest.TestCase):
i = QgsInterval.fromString('1 Day')
self.assertTrue(i.isValid())
self.assertEqual(i.seconds(), 24 * 60 * 60)
i = QgsInterval.fromString('101.5 Days')
self.assertTrue(i.isValid())
self.assertEqual(i.seconds(), 101.5 * 24 * 60 * 60)
i = QgsInterval.fromString('2 dAys')
self.assertTrue(i.isValid())
self.assertEqual(i.seconds(), 48 * 60 * 60)