Add a scale parameter for maps in the getPrint request

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15089 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 27, 2011 · 9e12afea67e3218139b6666470ab54ddedbf46af · 9e12afe
1 parent 3f8e6a9
commit 9e12afea67e3218139b6666470ab54ddedbf46af
Unified Split

Showing with 15 additions and 4 deletions.

+15 −4 src/mapserver/qgsconfigparser.cpp
diff --git a/src/mapserver/qgsconfigparser.cpp b/src/mapserver/qgsconfigparser.cpp
@@ -343,15 +343,26 @@ QgsComposition* QgsConfigParser::createPrintComposition( const QString& composer
       }
     }
 
-    //get layer list from string
+    //get forced scale from string
     if ( replacementList.size() > 2 )
+    {
+      bool conversionOk;
+      double scale = replacementList.at( 2 ).toDouble( &conversionOk );
+      if ( conversionOk )
+      {
+        currentMap->setNewScale( scale );
+      }
+    }
+
+    //get layer list from string
+    if ( replacementList.size() > 3 )
     {
       QStringList layerSet;
-      QStringList wmsLayerList = replacementList.at( 2 ).split( "," );
+      QStringList wmsLayerList = replacementList.at( 3 ).split( "," );
       QStringList wmsStyleList;
-      if ( replacementList.size() > 3 )
+      if ( replacementList.size() > 4 )
       {
-        wmsStyleList = replacementList.at( 3 ).split( "," );
+        wmsStyleList = replacementList.at( 4 ).split( "," );
       }
 
       for ( int i = 0; i < wmsLayerList.size(); ++i )