[QGIS Commit] r15112 - trunk/qgis/src/mapserver

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-02-01 00:07:50 -0800 (Tue, 01 Feb 2011)
New Revision: 15112

Modified:
   trunk/qgis/src/mapserver/qgsconfigparser.cpp
Log:
Set composer grid intervals x/y from WMS getPrint request

Modified: trunk/qgis/src/mapserver/qgsconfigparser.cpp
===================================================================
--- trunk/qgis/src/mapserver/qgsconfigparser.cpp	2011-01-31 10:47:19 UTC (rev 15111)
+++ trunk/qgis/src/mapserver/qgsconfigparser.cpp	2011-02-01 08:07:50 UTC (rev 15112)
@@ -400,6 +400,37 @@
       currentMap->setLayerSet( layerSet );
       currentMap->setKeepLayerSet( true );
     }
+
+    //grid space x / y
+    QMap< QString, QString >::const_iterator gridSpaceXIt = parameterMap.find( mapId + ":GRID_INTERVAL_X" );
+    if ( gridSpaceXIt != parameterMap.constEnd() )
+    {
+      bool intervalXOk;
+      double intervalX = gridSpaceXIt->toDouble( &intervalXOk );
+      if ( intervalXOk )
+      {
+        currentMap->setGridIntervalX( intervalX );
+      }
+    }
+    else
+    {
+      currentMap->setGridIntervalX( 0 );
+    }
+
+    QMap< QString, QString >::const_iterator gridSpaceYIt = parameterMap.find( mapId + ":GRID_INTERVAL_Y" );
+    if ( gridSpaceYIt != parameterMap.constEnd() )
+    {
+      bool intervalYOk;
+      double intervalY = gridSpaceYIt->toDouble( &intervalYOk );
+      if ( intervalYOk )
+      {
+        currentMap->setGridIntervalY( intervalY );
+      }
+    }
+    else
+    {
+      currentMap->setGridIntervalY( 0 );
+    }
   }
 
   //replace label text