[mapguide-commits] r6153 - in trunk/MgDev/Common: Renderers Stylization

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2011-09-29 12:32:21 -0700 (Thu, 29 Sep 2011)
New Revision: 6153

Modified:
   trunk/MgDev/Common/Renderers/EPlotRenderer.cpp
   trunk/MgDev/Common/Renderers/EPlotRenderer.h
   trunk/MgDev/Common/Stylization/SE_Renderer.cpp
   trunk/MgDev/Common/Stylization/SE_Renderer.h
Log:
Additional fix for ticket #1818 (Implement RFC 121 - Upgrade PHP, Apache and Tomcat to latest version)

Update the Visual Studio 2008 project file to account for new version of Apache.

Modified: trunk/MgDev/Common/Renderers/EPlotRenderer.cpp
===================================================================
--- trunk/MgDev/Common/Renderers/EPlotRenderer.cpp	2011-09-29 18:15:09 UTC (rev 6152)
+++ trunk/MgDev/Common/Renderers/EPlotRenderer.cpp	2011-09-29 19:32:21 UTC (rev 6153)
@@ -483,6 +483,14 @@
 }
 
 
+// Disable this optimization for EPlots.  When the plotted DWF is
+// zoomed in using the DWF viewer, we want to see text and not lines.
+bool EPlotRenderer::OptimizeGeometry()
+{
+    return false;
+}
+
+
 //TODO: fold this function and its twin residing in EMapUpdateRenderer
 //into DWFRenderer.
 void EPlotRenderer::AddW2DResource(DWFCore::DWFBufferOutputStream* w2dStream,

Modified: trunk/MgDev/Common/Renderers/EPlotRenderer.h
===================================================================
--- trunk/MgDev/Common/Renderers/EPlotRenderer.h	2011-09-29 18:15:09 UTC (rev 6152)
+++ trunk/MgDev/Common/Renderers/EPlotRenderer.h	2011-09-29 19:32:21 UTC (rev 6153)
@@ -67,6 +67,11 @@
 
     RENDERERS_API virtual void Done();
 
+    ////////////////////////////////////////////////
+    // SE_Renderer overloads
+    //
+    virtual bool OptimizeGeometry(); 
+
     ///////////////////////////////////////////////////////////////////
     // EPlot specific stuff
     //

Modified: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2011-09-29 18:15:09 UTC (rev 6152)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2011-09-29 19:32:21 UTC (rev 6153)
@@ -687,9 +687,11 @@
 
 
 //////////////////////////////////////////////////////////////////////////////
-// Indicates whether rendering optimization is used by this renderer.  For example, if we are rendering text and
-// optimization is turned on, then text is rendered as a simple line when it is very small.
-// By default, optimization is turned on.  For other behavior, this method must be overridden.
+// Indicates whether rendering optimization is used by this renderer.  For
+// example, if we are rendering text and optimization is turned on, then
+// text is rendered as a simple line when it is very small.  By default,
+// optimization is turned on.  For other behavior, this method must be
+// overridden.
 bool SE_Renderer::OptimizeGeometry()
 {
     return true;

Modified: trunk/MgDev/Common/Stylization/SE_Renderer.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.h	2011-09-29 18:15:09 UTC (rev 6152)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.h	2011-09-29 19:32:21 UTC (rev 6153)
@@ -129,9 +129,11 @@
     // helper method
     void ProcessLineLabels(LineBuffer* geometry, SE_RenderLineStyle* style);
 
-    // Indicates whether rendering optimization is used by this renderer.  For example, we are rendering text and
-    // optimization is turned on, then text is rendered as a simple line when it is very small.
-    // By default, optimization is turned on.  For other behavior, this method must be overridden.
+    // Indicates whether rendering optimization is used by this renderer.  For
+    // example, if we are rendering text and optimization is turned on, then
+    // text is rendered as a simple line when it is very small.  By default,
+    // optimization is turned on.  For other behavior, this method must be
+    // overridden.
     STYLIZATION_API virtual bool OptimizeGeometry();
 
 private: