vectorlayer: better matching of supported types (fixes #10564)

jef-n · jef-n · commit 68fd061d58cd · 2014-06-14T21:01:12.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6138,17 +6138,6 @@ void QgisApp::pasteStyle( QgsMapLayer * destinationLayer )
   }
 }
 
-#if 0
-void QgisApp::pasteTransformations()
-{
-  QgsPasteTransformations *pt = new QgsPasteTransformations();
-
-  mMapCanvas->freeze();
-
-  pt->exec();
-}
-#endif
-
 void QgisApp::copyFeatures( QgsFeatureStore & featureStore )
 {
   clipboard()->replaceWithCopyOf( featureStore );
diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp
@@ -264,13 +264,52 @@ bool QgsVectorDataProvider::supportedType( const QgsField &field ) const
                       .arg( mNativeTypes[i].mMaxLen )
                       .arg( mNativeTypes[i].mMinPrec )
                       .arg( mNativeTypes[i].mMaxPrec ), 2 );
-    if ( field.type() == mNativeTypes[i].mType &&
-         field.length() >= mNativeTypes[i].mMinLen && field.length() <= mNativeTypes[i].mMaxLen &&
-         field.precision() >= mNativeTypes[i].mMinPrec && field.precision() <= mNativeTypes[i].mMaxPrec )
+
+    if ( field.type() != mNativeTypes[i].mType )
+      continue;
+
+    if ( field.length() == -1 )
+    {
+      // source length unlimited
+      if ( mNativeTypes[i].mMinLen > -1 || mNativeTypes[i].mMaxLen > -1 )
+      {
+        // destination limited
+        continue;
+      }
+    }
+    else
+    {
+      // source length limited
+      if ( mNativeTypes[i].mMinLen > -1 && mNativeTypes[i].mMaxLen > -1 &&
+           ( field.length() < mNativeTypes[i].mMinLen || field.length() < mNativeTypes[i].mMaxLen ) )
+      {
+        // source length exceeds destination limits
+        continue;
+      }
+    }
+
+    if ( field.precision() == -1 )
+    {
+      // source precision unlimited / n/a
+      if ( mNativeTypes[i].mMinPrec > -1 || mNativeTypes[i].mMaxPrec > -1 )
+      {
+        // destination limited
+        continue;
+      }
+    }
+    else
     {
-      QgsDebugMsg( "native type matches" );
-      return true;
+      // source precision unlimited / n/a
+      if ( mNativeTypes[i].mMinPrec > -1 && mNativeTypes[i].mMaxPrec > -1 &&
+           ( field.precision() < mNativeTypes[i].mMinPrec || field.precision() < mNativeTypes[i].mMaxPrec ) )
+      {
+        // source precision exceeds destination limits
+        continue;
+      }
     }
+
+    QgsDebugMsg( "native type matches" );
+    return true;
   }
 
   QgsDebugMsg( "no sufficient native type found" );

Original file line number	Diff line number	Diff line change
`@@ -6138,17 +6138,6 @@ void QgisApp::pasteStyle( QgsMapLayer * destinationLayer )`
`6138`	`6138`	`}`
`6139`	`6139`	`}`
`6140`	`6140`
`6141`		`-#if 0`
`6142`		`-void QgisApp::pasteTransformations()`
`6143`		`-{`
`6144`		`- QgsPasteTransformations *pt = new QgsPasteTransformations();`
`6145`		`-`
`6146`		`- mMapCanvas->freeze();`
`6147`		`-`
`6148`		`- pt->exec();`
`6149`		`-}`
`6150`		`-#endif`
`6151`		`-`
`6152`	`6141`	`void QgisApp::copyFeatures( QgsFeatureStore & featureStore )`
`6153`	`6142`	`{`
`6154`	`6143`	`clipboard()->replaceWithCopyOf( featureStore );`