[mapguide-commits] r5020 - trunk/MgDev/Common/Stylization

[svn_mapguide at osgeo.org]

Author: tomfukushima
Date: 2010-07-09 19:49:00 +0000 (Fri, 09 Jul 2010)
New Revision: 5020

Modified:
   trunk/MgDev/Common/Stylization/SE_RenderProxies.h
   trunk/MgDev/Common/Stylization/SE_Renderer.cpp
   trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
Log:
#1394 Add expression string to SE_RenderText

Submit Rob's patch that is attached to the ticket.

Modified: trunk/MgDev/Common/Stylization/SE_RenderProxies.h
===================================================================
--- trunk/MgDev/Common/Stylization/SE_RenderProxies.h	2010-07-09 15:25:48 UTC (rev 5019)
+++ trunk/MgDev/Common/Stylization/SE_RenderProxies.h	2010-07-09 19:49:00 UTC (rev 5020)
@@ -142,6 +142,7 @@
     }
 
     std::wstring content;
+    std::wstring expression;
     double position[2];
     RS_TextDef tdef;
     RS_TextMetrics tm;

Modified: trunk/MgDev/Common/Stylization/SE_Renderer.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2010-07-09 15:25:48 UTC (rev 5019)
+++ trunk/MgDev/Common/Stylization/SE_Renderer.cpp	2010-07-09 19:49:00 UTC (rev 5020)
@@ -611,6 +611,7 @@
                 SE_RenderText* dt = new SE_RenderText();
                 rpc = dt;
 
+                dt->expression  = st->expression;
                 dt->content     = st->content;
                 dt->position[0] = st->position[0];
                 dt->position[1] = st->position[1];

Modified: trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp
===================================================================
--- trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp	2010-07-09 15:25:48 UTC (rev 5019)
+++ trunk/MgDev/Common/Stylization/SE_SymbolDefProxies.cpp	2010-07-09 19:49:00 UTC (rev 5020)
@@ -309,7 +309,8 @@
         ret->resizeControl = SE_ResizeControl_AdjustToResizeBox;
     else // default is ResizeNone
         ret->resizeControl = SE_ResizeControl_ResizeNone;
-
+    if(NULL != content.expression)
+        ret->expression  = content.expression->ToString();
     ret->content     = content.evaluate(ctx->exec);
     ret->position[0] = position[0].evaluate(ctx->exec);
     ret->position[1] = position[1].evaluate(ctx->exec);