[composer] Clean up map grid API, fix bug with grids not rearranging

correctly (sponsored by NIWA, New Zealand)
qgis · Sep 3, 2014 · 6adab88 · 6adab88
1 parent 4eeb818
commit 6adab88
Show file tree

Hide file tree

Showing 10 changed files with 1,700 additions and 1,029 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -3304,14 +3304,6 @@ bool QgsComposer::containsAdvancedEffects() const
           return true;
         }
       }
-      if ( currentMap->gridEnabled() )
-      {
-        // map contains an grid, check its blend mode
-        if ( currentMap->gridBlendMode() != QPainter::CompositionMode_SourceOver )
-        {
-          return true;
-        }
-      }
     }
   }
   return false;

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h
@@ -20,6 +20,7 @@
 
 #include "ui_qgscomposermapwidgetbase.h"
 #include "qgscomposermap.h"
+#include "qgscomposermapgrid.h"
 #include "qgscomposeritemwidget.h"
 
 class QgsMapLayer;
@@ -163,14 +164,14 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     /**Blocks / unblocks the signals of all GUI elements*/
     void blockAllSignals( bool b );
 
-    void handleChangedAnnotationPosition( QgsComposerMap::Border border, const QString& text );
-    void handleChangedAnnotationDirection( QgsComposerMap::Border border, const QString& text );
+    void handleChangedAnnotationPosition( QgsComposerMapGrid::BorderSide border, const QString& text );
+    void handleChangedAnnotationDirection( QgsComposerMapGrid::BorderSide border, const QString& text );
 
     void insertAnnotationPositionEntries( QComboBox* c );
     void insertAnnotationDirectionEntries( QComboBox* c );
 
-    void initAnnotationPositionBox( QComboBox* c, QgsComposerMap::GridAnnotationPosition pos );
-    void initAnnotationDirectionBox( QComboBox* c, QgsComposerMap::GridAnnotationDirection dir );
+    void initAnnotationPositionBox( QComboBox* c, QgsComposerMapGrid::AnnotationPosition pos );
+    void initAnnotationDirectionBox( QComboBox* c, QgsComposerMapGrid::AnnotationDirection dir );
 
     void updateGridLineSymbolMarker( const QgsComposerMapGrid* grid );
     void updateGridMarkerSymbolMarker( const QgsComposerMapGrid* grid );

diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -1280,7 +1280,7 @@ void QgsComposerItem::deleteAlignItems()
 
 void QgsComposerItem::repaint()
 {
-  update();
+  updateItem();
 }
 
 void QgsComposerItem::refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property )