cmake/SIPMacros.cmake

@@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
         ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
       ELSE(MSVC)
         # disable all warnings
-        ADD_DEFINITIONS( -w )
+        ADD_DEFINITIONS( -w -fpermissive )
       ENDIF(MSVC)
     ENDIF(PEDANTIC)
 

python/analysis/analysis.sip

@@ -1,4 +1,3 @@
-
 %Module qgis.analysis 0
 
 %Import QtCore/QtCoremod.sip

python/core/core.sip

@@ -1,4 +1,3 @@
-
 %Module qgis.core 0
 
 %Import QtCore/QtCoremod.sip

python/core/qgsvectordataprovider.sip

@@ -42,7 +42,9 @@ class QgsVectorDataProvider : QgsDataProvider
         ChangeGeometries =             256,
         SelectGeometryAtId =           512,
         RandomSelectGeometryAtId =     1024,
-        SequentialSelectGeometryAtId = 2048
+        SequentialSelectGeometryAtId = 2048,
+        CreateAttributeIndex =         4096,
+        SetEncoding =                  8192,
       };
 
       /** bitmask of all provider's editing capabilities */

python/core/symbology-ng-core.sip

@@ -629,10 +629,10 @@ class QgsSymbolV2RenderContext
     void setAlpha( qreal alpha );
 
     bool selected() const;
-    void setSelected( bool selected ) const;
+    void setSelected( bool selected );
 
     //! @note added in 1.5
-    int renderHints() const;
+    int renderHints();
     //! @note added in 1.5
     void setRenderHints( int hints );
 

src/core/qgsvectorlayer.cpp

@@ -761,7 +761,7 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
       }
 
       // labeling - register feature
-      if ( mRendererV2->symbolForFeature( fet ) != NULL )
+      if ( mRendererV2->symbolForFeature( fet ) != NULL && rendererContext.labelingEngine() )
       {
         if ( labeling )
         {
@@ -847,7 +847,7 @@ void QgsVectorLayer::drawRendererV2Levels( QgsRenderContext& rendererContext, bo
       mCachedGeometries[fet.id()] = *fet.geometry();
     }
 
-    if ( sym )
+    if ( sym && rendererContext.labelingEngine() )
     {
       if ( labeling )
       {
@@ -1094,7 +1094,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
         //double scale = rendererContext.scaleFactor() /  markerScaleFactor;
         drawFeature( rendererContext, fet, &marker );
 
-        if ( mRenderer->willRenderFeature( &fet ) )
+        if ( mRenderer->willRenderFeature( &fet ) && rendererContext.labelingEngine() )
         {
           if ( labeling )
           {
@@ -5289,47 +5289,47 @@ void QgsVectorLayer::updateAttributeMapIndex( QgsAttributeMap& map, int oldIndex
 
 void QgsVectorLayer::prepareLabelingAndDiagrams( QgsRenderContext& rendererContext, QgsAttributeList& attributes, bool& labeling )
 {
-  if ( rendererContext.labelingEngine() )
+  if ( !rendererContext.labelingEngine() )
+    return;
+
+  QSet<int> attrIndex;
+  if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex, rendererContext ) )
   {
-    QSet<int> attrIndex;
-    if ( rendererContext.labelingEngine()->prepareLayer( this, attrIndex, rendererContext ) )
+    QSet<int>::const_iterator attIt = attrIndex.constBegin();
+    for ( ; attIt != attrIndex.constEnd(); ++attIt )
     {
-      QSet<int>::const_iterator attIt = attrIndex.constBegin();
-      for ( ; attIt != attrIndex.constEnd(); ++attIt )
+      if ( !attributes.contains( *attIt ) )
       {
-        if ( !attributes.contains( *attIt ) )
-        {
-          attributes << *attIt;
-        }
+        attributes << *attIt;
       }
-      labeling = true;
     }
+    labeling = true;
+  }
 
-    //register diagram layers
-    if ( mDiagramRenderer && mDiagramLayerSettings )
+  //register diagram layers
+  if ( mDiagramRenderer && mDiagramLayerSettings )
+  {
+    mDiagramLayerSettings->renderer = mDiagramRenderer;
+    rendererContext.labelingEngine()->addDiagramLayer( this, mDiagramLayerSettings );
+    //add attributes needed by the diagram renderer
+    QList<int> att = mDiagramRenderer->diagramAttributes();
+    QList<int>::const_iterator attIt = att.constBegin();
+    for ( ; attIt != att.constEnd(); ++attIt )
     {
-      mDiagramLayerSettings->renderer = mDiagramRenderer;
-      rendererContext.labelingEngine()->addDiagramLayer( this, mDiagramLayerSettings );
-      //add attributes needed by the diagram renderer
-      QList<int> att = mDiagramRenderer->diagramAttributes();
-      QList<int>::const_iterator attIt = att.constBegin();
-      for ( ; attIt != att.constEnd(); ++attIt )
-      {
-        if ( !attributes.contains( *attIt ) )
-        {
-          attributes << *attIt;
-        }
-      }
-      //and the ones needed for data defined diagram positions
-      if ( mDiagramLayerSettings->xPosColumn >= 0 && !attributes.contains( mDiagramLayerSettings->xPosColumn ) )
-      {
-        attributes << mDiagramLayerSettings->xPosColumn;
-      }
-      if ( mDiagramLayerSettings->yPosColumn >= 0 && !attributes.contains( mDiagramLayerSettings->yPosColumn ) )
+      if ( !attributes.contains( *attIt ) )
       {
-        attributes << mDiagramLayerSettings->yPosColumn;
+        attributes << *attIt;
       }
     }
+    //and the ones needed for data defined diagram positions
+    if ( mDiagramLayerSettings->xPosColumn >= 0 && !attributes.contains( mDiagramLayerSettings->xPosColumn ) )
+    {
+      attributes << mDiagramLayerSettings->xPosColumn;
+    }
+    if ( mDiagramLayerSettings->yPosColumn >= 0 && !attributes.contains( mDiagramLayerSettings->yPosColumn ) )
+    {
+      attributes << mDiagramLayerSettings->yPosColumn;
+    }
   }
 }