[mapguide-commits] r6082 - in sandbox/adsk/2.3r: . Server/src/Services/Mapping

[svn_mapguide at osgeo.org]

Author: christinebao
Date: 2011-08-16 20:27:44 -0700 (Tue, 16 Aug 2011)
New Revision: 6082

Modified:
   sandbox/adsk/2.3r/
   sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp
   sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.h
Log:
Integrate r6074 of trunk to 2.3r.
Fix ticket http://trac.osgeo.org/mapguide/ticket/1781
GetPLOT command does not finish using raster data


Property changes on: sandbox/adsk/2.3r
___________________________________________________________________
Modified: svn:mergeinfo
   - /:5504
/trunk/MgDev:5504,5539,5561-5562,5595
   + /:5504
/trunk/MgDev:5504,5539,5561-5562,5595,6074

Modified: sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp
===================================================================
--- sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp	2011-08-16 12:11:22 UTC (rev 6081)
+++ sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.cpp	2011-08-17 03:27:44 UTC (rev 6082)
@@ -104,6 +104,16 @@
                           MgConfigProperties::RenderingServicePropertyRasterGridSizeOverrideRatioForPlot,
                           m_rasterGridSizeOverrideRatioForPlot,
                           MgConfigProperties::DefaultRenderingServicePropertyRasterGridSizeOverrideRatioForPlot);
+
+    pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
+                          MgConfigProperties::RenderingServicePropertyMaxRasterImageWidth,
+                          m_maxRasterImageWidth,
+                          MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageWidth);
+
+    pConf->GetIntValue(MgConfigProperties::RenderingServicePropertiesSection,
+                          MgConfigProperties::RenderingServicePropertyMaxRasterImageHeight,
+                          m_maxRasterImageHeight,
+                          MgConfigProperties::DefaultRenderingServicePropertyMaxRasterImageHeight);
 }
 
 
@@ -184,6 +194,8 @@
     dr.SetRasterGridSize(m_rasterGridSize);
     dr.SetMinRasterGridSize(m_minRasterGridSize);
     dr.SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatio);
+    dr.SetMaxRasterImageWidth(m_maxRasterImageWidth);
+    dr.SetMaxRasterImageHeight(m_maxRasterImageHeight);
 
     //get the coordinate system unit scale
     MdfModel::MdfString srs = map->GetMapSRS();
@@ -478,6 +490,8 @@
     dr.SetRasterGridSize(m_rasterGridSize);
     dr.SetMinRasterGridSize(m_minRasterGridSize);
     dr.SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatio);
+    dr.SetMaxRasterImageWidth(m_maxRasterImageWidth);
+    dr.SetMaxRasterImageHeight(m_maxRasterImageHeight);
 
     RSMgSymbolManager mgr(m_svcResource);
     dr.SetSymbolManager(&mgr);
@@ -953,6 +967,8 @@
     dr.SetRasterGridSize(m_rasterGridSizeForPlot);
     dr.SetMinRasterGridSize(m_minRasterGridSizeForPlot);
     dr.SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatioForPlot);
+    dr.SetMaxRasterImageWidth(m_maxRasterImageWidth);
+    dr.SetMaxRasterImageHeight(m_maxRasterImageHeight);
 
     RSMgSymbolManager mgr(m_svcResource);
     dr.SetSymbolManager(&mgr);
@@ -1377,6 +1393,8 @@
     dr.SetRasterGridSize(m_rasterGridSize);
     dr.SetMinRasterGridSize(m_minRasterGridSize);
     dr.SetRasterGridSizeOverrideRatio(m_rasterGridSizeOverrideRatio);
+    dr.SetMaxRasterImageWidth(m_maxRasterImageWidth);
+    dr.SetMaxRasterImageHeight(m_maxRasterImageHeight);
 
     RSMgSymbolManager mgr(m_svcResource);
     dr.SetSymbolManager(&mgr);

Modified: sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.h
===================================================================
--- sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.h	2011-08-16 12:11:22 UTC (rev 6081)
+++ sandbox/adsk/2.3r/Server/src/Services/Mapping/ServerMappingService.h	2011-08-17 03:27:44 UTC (rev 6082)
@@ -140,6 +140,9 @@
         INT32 m_rasterGridSizeForPlot;
         INT32 m_minRasterGridSizeForPlot;
         double m_rasterGridSizeOverrideRatioForPlot;
+
+        INT32 m_maxRasterImageWidth;
+        INT32 m_maxRasterImageHeight;
 };
 
 #endif