Showing with 3 additions and 4 deletions.
  1. +3 −1 src/providers/ogr/qgsogrprovider.cpp
  2. +0 −3 src/ui/qgsdiagrampropertiesbase.ui
4 changes: 3 additions & 1 deletion src/providers/ogr/qgsogrprovider.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -528,17 +528,19 @@ QStringList QgsOgrProvider::subLayers() const
QString theLayerName = FROM8( OGR_FD_GetName( fdef ) );
OGRwkbGeometryType layerGeomType = OGR_FD_GetGeomType( fdef );

QgsDebugMsg( QString("layerGeomType = %1").arg( layerGeomType ) );

if ( layerGeomType != wkbUnknown )
{
int theLayerFeatureCount = OGR_L_GetFeatureCount( layer, 0 );

QString geom = ogrWkbGeometryTypeName( layerGeomType );

mSubLayerList << QString( "%1:%2:%3:%4" ).arg( i ).arg( theLayerName ).arg( theLayerFeatureCount == -1 ? tr( "Unknown" ) : QString::number( theLayerFeatureCount ) ).arg( geom );
QgsDebugMsg( "Unknown geometry type, count features for each geometry type" );
}
else
{
QgsDebugMsg( "Unknown geometry type, count features for each geometry type" );
// Add virtual sublayers for supported geometry types if layer type is unknown
// Count features for geometry types
QMap<OGRwkbGeometryType, int> fCount;
Expand Down
3 changes: 0 additions & 3 deletions src/ui/qgsdiagrampropertiesbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,6 @@
<string>The attribute value you enter here will correspond to the size entered in the field &quot;Size&quot; and the chosen &quot;Size unit&quot;.
Leave empty to automatically apply the maximum value.</string>
</property>
<property name="placeholderText">
<string>Empty: Use maximum value</string>
</property>
</widget>
</item>
</layout>
Expand Down