[mapguide-commits] r7148 - sandbox/jng/weblayout/Web/src/mapviewernet

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-10-19 12:18:48 -0700 (Fri, 19 Oct 2012)
New Revision: 7148

Modified:
   sandbox/jng/weblayout/Web/src/mapviewernet/common.aspx
   sandbox/jng/weblayout/Web/src/mapviewernet/mainframe.aspx
   sandbox/jng/weblayout/Web/src/mapviewernet/mapframe.aspx
Log:
.net viewer updates to read and pass/plug the new Web Layout properties

Modified: sandbox/jng/weblayout/Web/src/mapviewernet/common.aspx
===================================================================
--- sandbox/jng/weblayout/Web/src/mapviewernet/common.aspx	2012-10-19 18:55:14 UTC (rev 7147)
+++ sandbox/jng/weblayout/Web/src/mapviewernet/common.aspx	2012-10-19 19:18:48 UTC (rev 7148)
@@ -278,9 +278,14 @@
 
 String ValidateColorString(String proposedColorString)
 {
+    return ValidateColorString(proposedColorString, 6);
+}
+
+String ValidateColorString(String proposedColorString, int charCount)
+{
     String validColorString = "000000";
     if (proposedColorString != null &&
-        System.Text.RegularExpressions.Regex.IsMatch(proposedColorString, "^[A-Fa-f0-9]{6}$"))
+        System.Text.RegularExpressions.Regex.IsMatch(proposedColorString, "^[A-Fa-f0-9]{" + charCount + "}$"))
     {
         validColorString = proposedColorString;
     }

Modified: sandbox/jng/weblayout/Web/src/mapviewernet/mainframe.aspx
===================================================================
--- sandbox/jng/weblayout/Web/src/mapviewernet/mainframe.aspx	2012-10-19 18:55:14 UTC (rev 7147)
+++ sandbox/jng/weblayout/Web/src/mapviewernet/mainframe.aspx	2012-10-19 19:18:48 UTC (rev 7148)
@@ -32,6 +32,7 @@
 String orgSessionId = "";
 String username = "";
 String password = "";
+String startupScriptCode = "";
 String locale = "";
 String mapName = "";
 int curFlyout = 0;
@@ -102,6 +103,12 @@
         MgWebTaskBar taskBar = taskPane.GetTaskBar();
         String mapDef = webLayout.GetMapDefinition();
 
+        startupScriptCode = webLayout.GetStartupScript();
+        String selectionColor = webLayout.GetSelectionColor();
+        String mapImgFormat = webLayout.GetMapImageFormat();
+        String selImgFormat = webLayout.GetSelectionImageFormat();
+        int pointBuffer = webLayout.GetPointSelectionBuffer();
+
         bool showTaskPane = taskPane.IsVisible();
         bool showTaskBar = taskBar.IsVisible();
         bool showStatusbar = statusBar.IsVisible();
@@ -449,6 +456,10 @@
                         webLayout.GetHyperlinkTarget().ToString(NumberFormatInfo.InvariantInfo),
                         webLayout.GetHyperlinkTargetFrame(),
                         webLayout.IsZoomControlVisible()? "1": "0",
+                        selectionColor,
+                        mapImgFormat,
+                        selImgFormat,
+                        pointBuffer.ToString(NumberFormatInfo.InvariantInfo),
                         sessionParam,
                         vpath + "formframe.aspx",
                         taskBarHeight.ToString(NumberFormatInfo.InvariantInfo),
@@ -476,6 +487,10 @@
                         webLayout.GetHyperlinkTarget().ToString(NumberFormatInfo.InvariantInfo),
                         webLayout.GetHyperlinkTargetFrame(),
                         webLayout.IsZoomControlVisible()? "1": "0",
+                        selectionColor,
+                        mapImgFormat,
+                        selImgFormat,
+                        pointBuffer.ToString(NumberFormatInfo.InvariantInfo),
                         sessionParam,
                         srcTaskFrame,
                         vpath + "formframe.aspx",
@@ -517,6 +532,7 @@
                     userCode,
                     taskItemTexts,
                     selAwareCmds,
+                    startupScriptCode,
                     vpath + "quickplotpanel.aspx",
                     vpath + "measureui.aspx",
                     vpath + "searchprompt.aspx",

Modified: sandbox/jng/weblayout/Web/src/mapviewernet/mapframe.aspx
===================================================================
--- sandbox/jng/weblayout/Web/src/mapviewernet/mapframe.aspx	2012-10-19 18:55:14 UTC (rev 7147)
+++ sandbox/jng/weblayout/Web/src/mapviewernet/mapframe.aspx	2012-10-19 19:18:48 UTC (rev 7148)
@@ -35,6 +35,10 @@
 String type;
 String hlTgt;
 String hlTgtName;
+String selectionColor;
+String mapImgFormat;
+String selImgFormat;
+int pointBufferSize;
 </script>
 
 <%
@@ -180,6 +184,10 @@
                         locale,
                         vpath + "getselectedfeatures.aspx",
                         scaleCreationCode,
+                        selectionColor,
+                        mapImgFormat,
+                        selImgFormat,
+                        pointBufferSize.ToString(NumberFormatInfo.InvariantInfo),
                         vpath + "ajaxviewerabout.aspx",
                         vpath + "legendctrl.aspx",
                         HttpUtility.UrlEncode(mapName),
@@ -225,8 +233,13 @@
     showProperties = GetIntParameter(parameters, "SHOWPROP");
     showSlider = GetIntParameter(parameters, "SHOWSLIDER");
 
+    selectionColor = ValidateColorString(GetParameter(parameters, "SELCOLOR"), 8);
+    mapImgFormat = GetParameter(parameters, "MAPIMGFORMAT");
+    selImgFormat = GetParameter(parameters, "SELIMGFORMAT");
+    pointBufferSize = GetIntParameter(parameters, "POINTBUFFERSIZE");
+
     mapDefinition = ValidateResourceId(GetParameter(parameters, "MAPDEFINITION"));
-    }
+}
 
 String IntToString(int number)
 {