[mapguide-commits] r7143 - sandbox/jng/weblayout/Web/src/WebApp

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-10-19 10:36:38 -0700 (Fri, 19 Oct 2012)
New Revision: 7143

Modified:
   sandbox/jng/weblayout/Web/src/WebApp/WebLayout.cpp
   sandbox/jng/weblayout/Web/src/WebApp/WebLayout.h
Log:
Update MgWebLayout

Modified: sandbox/jng/weblayout/Web/src/WebApp/WebLayout.cpp
===================================================================
--- sandbox/jng/weblayout/Web/src/WebApp/WebLayout.cpp	2012-10-19 17:19:41 UTC (rev 7142)
+++ sandbox/jng/weblayout/Web/src/WebApp/WebLayout.cpp	2012-10-19 17:36:38 UTC (rev 7143)
@@ -23,7 +23,12 @@
 MgWebLayout::MgWebLayout(MgResourceService* resourceService, MgResourceIdentifier* webLayoutId)
 :  m_scale(-1.0),
    m_hyperlinkTarget(MgWebTargetType::TaskPane),
-   m_zoomControlVisible(true)
+   m_zoomControlVisible(true),
+   m_selectionColor(L"0000FFFF"), //NOXLATE
+   m_pointPixelBuffer(2),
+   m_mapImageFormat(MgImageFormats::Png),
+   m_selectionImageFormat(MgImageFormats::Png),
+   m_startupScript(L"") //NOXLATE
 {
     MG_TRY()
 
@@ -82,6 +87,66 @@
 }
 
 ///////////////////////////////////////////////////////////////////////////
+/// <summary>
+/// Returns the selection color in HTML RGBA format
+/// </summary>
+/// <returns>
+/// The selection color in HTML RGBA format
+/// </returns>
+STRING MgWebLayout::GetSelectionColor()
+{
+    return m_selectionColor;
+}
+
+///////////////////////////////////////////////////////////////////////////
+/// <summary>
+/// Returns the point selection buffer size in pixels
+/// </summary>
+/// <returns>
+/// The point selection buffer size in pixels
+/// </returns>
+INT32 MgWebLayout::GetPointSelectionBuffer()
+{
+    return m_pointPixelBuffer;
+}
+
+///////////////////////////////////////////////////////////////////////////
+/// <summary>
+/// Returns the map image format
+/// </summary>
+/// <returns>
+/// The map image format
+/// </returns>
+STRING MgWebLayout::GetMapImageFormat()
+{
+    return m_mapImageFormat;
+}
+
+///////////////////////////////////////////////////////////////////////////
+/// <summary>
+/// Returns the selection overlay image format
+/// </summary>
+/// <returns>
+/// The selection overlay image format
+/// </returns>
+STRING MgWebLayout::GetSelectionImageFormat()
+{
+    return m_selectionImageFormat;
+}
+
+///////////////////////////////////////////////////////////////////////////
+/// <summary>
+/// Returns the startup script code that is executed when the viewer has loaded
+/// </summary>
+/// <returns>
+/// The startup script code
+/// </returns>
+STRING MgWebLayout::GetStartupScript() 
+{
+    return m_startupScript;
+}
+
+///////////////////////////////////////////////////////////////////////////
 // Returns the initial scale of the view. Return -1. if scale is not set
 //
 double MgWebLayout::GetScale()
@@ -255,12 +320,32 @@
             {
                 ParseMapProperties(elt);
             }
-            else if(strName == L"EnablePingServer")
+            else if(strName == L"EnablePingServer") //NOXLATE
             {
                 m_enablePingServer = GetBooleanFromElement(elt);
             }
-            else if(strName == L"InformationPane")
+            else if(strName == L"SelectionColor") //NOXLATE
             {
+                m_selectionColor = GetStringFromElement(elt);
+            }
+            else if(strName == L"PointSelectionBuffer") //NOXLATE
+            {
+                m_pointPixelBuffer = GetIntegerFromElement(elt);
+            }
+            else if(strName == L"MapImageFormat") //NOXLATE
+            {
+                m_mapImageFormat = GetStringFromElement(elt);
+            }
+            else if(strName == L"SelectionImageFormat") //NOXLATE
+            {
+                m_selectionImageFormat = GetStringFromElement(elt);
+            }
+            else if(strName == L"StartupScript") //NOXLATE
+            {
+                m_startupScript = GetStringFromElement(elt);
+            }
+            else if(strName == L"InformationPane") //NOXLATE
+            {
                 ParseInformationPane(elt);
             }
             else if (strName == L"StatusBar") // NOXLATE

Modified: sandbox/jng/weblayout/Web/src/WebApp/WebLayout.h
===================================================================
--- sandbox/jng/weblayout/Web/src/WebApp/WebLayout.h	2012-10-19 17:19:41 UTC (rev 7142)
+++ sandbox/jng/weblayout/Web/src/WebApp/WebLayout.h	2012-10-19 17:36:38 UTC (rev 7143)
@@ -64,6 +64,51 @@
 
     ///////////////////////////////////////////////////////////////////////////
     /// <summary>
+    /// Returns the selection color in HTML RGBA format
+    /// </summary>
+    /// <returns>
+    /// The selection color in HTML RGBA format
+    /// </returns>
+    STRING GetSelectionColor();
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// <summary>
+    /// Returns the point selection buffer size in pixels
+    /// </summary>
+    /// <returns>
+    /// The point selection buffer size in pixels
+    /// </returns>
+    INT32 GetPointSelectionBuffer();
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// <summary>
+    /// Returns the map image format
+    /// </summary>
+    /// <returns>
+    /// The map image format
+    /// </returns>
+    STRING GetMapImageFormat();
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// <summary>
+    /// Returns the selection overlay image format
+    /// </summary>
+    /// <returns>
+    /// The selection overlay image format
+    /// </returns>
+    STRING GetSelectionImageFormat();
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// <summary>
+    /// Returns the startup script code that is executed when the viewer has loaded
+    /// </summary>
+    /// <returns>
+    /// The startup script code
+    /// </returns>
+    STRING GetStartupScript();
+
+    ///////////////////////////////////////////////////////////////////////////
+    /// <summary>
     /// Returns the initial scale of the view. Return -1. if scale is not set
     /// </summary>
     /// <returns>
@@ -382,6 +427,11 @@
     STRING       m_title;
     STRING       m_mapDefinition;
     bool         m_enablePingServer;
+    STRING       m_mapImageFormat;
+    STRING       m_selectionImageFormat;
+    INT32        m_pointPixelBuffer;
+    STRING       m_selectionColor;
+    STRING       m_startupScript;
     INT32        m_hyperlinkTarget;
     STRING       m_hyperlinkTargetFrame;
     double       m_scale;