#44160 add millisecond support to OGRUtils

qgis · Sep 17, 2021 · 0a3526f · 0a3526f
1 parent 606bd09
commit 0a3526f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/core/qgsogrutils.cpp b/src/core/qgsogrutils.cpp
@@ -339,15 +339,20 @@ QVariant QgsOgrUtils::getOgrFeatureAttribute( OGRFeatureH ogrFet, const QgsField
       case QVariant::DateTime:
       case QVariant::Time:
       {
-        int year, month, day, hour, minute, second, tzf;
+        int year, month, day, hour, minute, tzf;
+        float second;
+        float secondsPart = 0;
+
+        OGR_F_GetFieldAsDateTimeEx( ogrFet, attIndex, &year, &month, &day, &hour, &minute, &second, &tzf );
+        float millisecondPart = std::modf( second, &secondsPart );
 
-        OGR_F_GetFieldAsDateTime( ogrFet, attIndex, &year, &month, &day, &hour, &minute, &second, &tzf );
         if ( field.type() == QVariant::Date )
           value = QDate( year, month, day );
         else if ( field.type() == QVariant::Time )
-          value = QTime( hour, minute, second );
+          value = QTime( hour, minute, static_cast< int >( secondsPart ), static_cast< int >( 1000 * millisecondPart ) );
         else
-          value = QDateTime( QDate( year, month, day ), QTime( hour, minute, second ) );
+          value = QDateTime( QDate( year, month, day ),
+                             QTime( hour, minute, static_cast< int >( secondsPart ), static_cast< int >( 1000 * millisecondPart ) ) );
       }
       break;