fix #7503

qgis · Apr 4, 2013 · 052dab819d1636f958ece681999f9c675a333b91 · 052dab8
1 parent db1d6ab
commit 052dab819d1636f958ece681999f9c675a333b91
Unified Split

Showing with 90 additions and 5 deletions.

+25 −0 src/core/qgsvectorfilewriter.cpp

+1 −1 src/core/raster/qgshuesaturationfilter.cpp

+64 −4 src/providers/ogr/qgsogrprovider.cpp
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
@@ -333,6 +333,14 @@ QgsVectorFileWriter::QgsVectorFileWriter(
         ogrType = OFTReal;
         break;
 
+      case QVariant::Date:
+        ogrType = OFTDate;
+        break;
+
+      case QVariant::DateTime:
+        ogrType = OFTDateTime;
+        break;
+
       default:
         //assert(0 && "invalid variant type!");
         mErrorMessage = QObject::tr( "unsupported type for field %1" )
@@ -543,6 +551,23 @@ OGRFeatureH QgsVectorFileWriter::createFeature( QgsFeature& feature )
       case QVariant::String:
         OGR_F_SetFieldString( poFeature, ogrField, mCodec->fromUnicode( attrValue.toString() ).data() );
         break;
+      case QVariant::Date:
+        OGR_F_SetFieldDateTime( poFeature, ogrField,
+                                attrValue.toDate().year(),
+                                attrValue.toDate().month(),
+                                attrValue.toDate().day(),
+                                0, 0, 0, 0 );
+        break;
+      case QVariant::DateTime:
+        OGR_F_SetFieldDateTime( poFeature, ogrField,
+                                attrValue.toDateTime().date().year(),
+                                attrValue.toDateTime().date().month(),
+                                attrValue.toDateTime().date().day(),
+                                attrValue.toDateTime().time().hour(),
+                                attrValue.toDateTime().time().minute(),
+                                attrValue.toDateTime().time().second(),
+                                0 );
+        break;
       case QVariant::Invalid:
         break;
       default:

diff --git a/src/core/raster/qgshuesaturationfilter.cpp b/src/core/raster/qgshuesaturationfilter.cpp
@@ -155,7 +155,7 @@ QgsRasterBlock * QgsHueSaturationFilter::block( int bandNo, QgsRectangle  const
   QColor myColor;
   int h, s, l;
   int r, g, b, alpha;
-  double alphaFactor;
+  double alphaFactor = 1.0;
 
   for ( size_t i = 0; i < ( size_t )width*height; i++ )
   {

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -107,6 +107,14 @@ bool QgsOgrProvider::convertField( QgsField &field, const QTextCodec &encoding )
       ogrType = OFTReal;
       break;
 
+    case QVariant::Date:
+      ogrType = OFTDate;
+      break;
+
+    case QVariant::DateTime:
+      ogrType = OFTDateTime;
+      break;
+
     default:
       return false;
   }
@@ -336,11 +344,12 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
     QgsMessageLog::logMessage( tr( "Data source is invalid (%1)" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ), tr( "OGR" ) );
   }
 
-  // FIXME: sync with app/qgsnewvectorlayerdialog.cpp
   mNativeTypes
   << QgsVectorDataProvider::NativeType( tr( "Whole number (integer)" ), "integer", QVariant::Int, 1, 10 )
   << QgsVectorDataProvider::NativeType( tr( "Decimal number (real)" ), "double", QVariant::Double, 1, 20, 0, 15 )
   << QgsVectorDataProvider::NativeType( tr( "Text (string)" ), "string", QVariant::String, 1, 255 )
+  << QgsVectorDataProvider::NativeType( tr( "Date" ), "date", QVariant::Date )
+  << QgsVectorDataProvider::NativeType( tr( "Date & Time" ), "datetime", QVariant::DateTime )
   ;
 }
 
@@ -557,10 +566,10 @@ void QgsOgrProvider::loadFields()
       {
         case OFTInteger: varType = QVariant::Int; break;
         case OFTReal: varType = QVariant::Double; break;
-          // unsupported in OGR 1.3
-          //case OFTDateTime: varType = QVariant::DateTime; break;
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1400
-        case OFTString: varType = QVariant::String; break;
+        case OFTDate: varType = QVariant::Date; break;
+        case OFTDateTime: varType = QVariant::DateTime; break;
+        case OFTString:
 #endif
         default: varType = QVariant::String; // other unsupported, leave it as a string
       }
@@ -800,6 +809,25 @@ bool QgsOgrProvider::addFeature( QgsFeature& f )
           OGR_F_SetFieldDouble( feature, targetAttributeId, attrVal.toDouble() );
           break;
 
+        case OFTDate:
+          OGR_F_SetFieldDateTime( feature, targetAttributeId,
+                                  attrVal.toDate().year(),
+                                  attrVal.toDate().month(),
+                                  attrVal.toDate().day(),
+                                  0, 0, 0,
+                                  0 );
+          break;
+        case OFTDateTime:
+          OGR_F_SetFieldDateTime( feature, targetAttributeId,
+                                  attrVal.toDateTime().date().year(),
+                                  attrVal.toDateTime().date().month(),
+                                  attrVal.toDateTime().date().day(),
+                                  attrVal.toDateTime().time().hour(),
+                                  attrVal.toDateTime().time().minute(),
+                                  attrVal.toDateTime().time().second(),
+                                  0 );
+          break;
+
         case OFTString:
           QgsDebugMsg( QString( "Writing string attribute %1 with %2, encoding %3" )
                        .arg( targetAttributeId )
@@ -870,6 +898,12 @@ bool QgsOgrProvider::addAttributes( const QList<QgsField> &attributes )
       case QVariant::Double:
         type = OFTReal;
         break;
+      case QVariant::Date:
+        type = OFTDate;
+        break;
+      case QVariant::DateTime:
+        type = OFTDateTime;
+        break;
       case QVariant::String:
         type = OFTString;
         break;
@@ -976,6 +1010,24 @@ bool QgsOgrProvider::changeAttributeValues( const QgsChangedAttributesMap & attr
           case OFTReal:
             OGR_F_SetFieldDouble( of, f, it2->toDouble() );
             break;
+          case OFTDate:
+            OGR_F_SetFieldDateTime( of, f,
+                                    it2->toDate().year(),
+                                    it2->toDate().month(),
+                                    it2->toDate().day(),
+                                    0, 0, 0,
+                                    0 );
+            break;
+          case OFTDateTime:
+            OGR_F_SetFieldDateTime( of, f,
+                                    it2->toDateTime().date().year(),
+                                    it2->toDateTime().date().month(),
+                                    it2->toDateTime().date().day(),
+                                    it2->toDateTime().time().hour(),
+                                    it2->toDateTime().time().minute(),
+                                    it2->toDateTime().time().second(),
+                                    0 );
+            break;
           case OFTString:
             OGR_F_SetFieldString( of, f, mEncoding->fromUnicode( it2->toString() ).constData() );
             break;
@@ -1843,6 +1895,14 @@ QGISEXTERN bool createEmptyDataSource( const QString &uri,
       field = OGR_Fld_Create( TO8( it->first ), OFTString );
       OGR_Fld_SetWidth( field, width );
     }
+    else if ( fields[0] == "Date" )
+    {
+      field = OGR_Fld_Create( TO8( it->first ), OFTDate );
+    }
+    else if ( fields[0] == "DateTime" )
+    {
+      field = OGR_Fld_Create( TO8( it->first ), OFTDateTime );
+    }
     else
     {
       continue;