[fusion-commits] r2557 - trunk/widgets/QuickPlot

[svn_fusion at osgeo.org]

Author: liuar
Date: 2012-07-26 03:00:05 -0700 (Thu, 26 Jul 2012)
New Revision: 2557

Modified:
   trunk/widgets/QuickPlot/QuickPlotPanel.js
   trunk/widgets/QuickPlot/QuickPlotPanel.templ
Log:
On behalf of Ted Yang.
fix the ticket 2075: http://trac.osgeo.org/mapguide/ticket/2075
	
The submission is mainly implement the RFC 124:http://trac.osgeo.org/mapguide/wiki/MapGuideRfc124
part 4:
refine the GUI to make the paper list and orientation always enable

Modified: trunk/widgets/QuickPlot/QuickPlotPanel.js
===================================================================
--- trunk/widgets/QuickPlot/QuickPlotPanel.js	2012-07-26 02:00:35 UTC (rev 2556)
+++ trunk/widgets/QuickPlot/QuickPlotPanel.js	2012-07-26 10:00:05 UTC (rev 2557)
@@ -80,8 +80,7 @@
         var lastScale       = getParent().Cookie.read("QuickPlotLastUsedScaling");
         var lastDPI         = getParent().Cookie.read("QuickPlotLastUsedDPI");
         var lastOrientation = getParent().Cookie.read("QuickPlotLastUsedOrientation");
-        
-        
+
         if (lastPaperSize != null){
             document.getElementById("PaperList").value = lastPaperSize;
         }
@@ -118,10 +117,8 @@
 
 function setAdvancedOptionsUI(enabled)
 {
-    document.getElementById("PaperList").disabled       = !enabled;
     document.getElementById("ScalingList").disabled     = !enabled;
     document.getElementById("DPIList").disabled         = !enabled;
-    document.getElementById("OrientationList").disabled = !enabled;
     
     var mapCapturer = getParent().Fusion.getWidgetsByType("QuickPlot")[0].mapCapturer;
     
@@ -304,5 +301,5 @@
 function drawCaptureBox()
 {
     var mapCapturer = getParent().Fusion.getWidgetsByType("QuickPlot")[0].mapCapturer;
-    mapCapturer.setSize(getPrintSize(), getScale());
+    mapCapturer.setSize( getPrintSize() , getScale() );
 }

Modified: trunk/widgets/QuickPlot/QuickPlotPanel.templ
===================================================================
--- trunk/widgets/QuickPlot/QuickPlotPanel.templ	2012-07-26 02:00:35 UTC (rev 2556)
+++ trunk/widgets/QuickPlot/QuickPlotPanel.templ	2012-07-26 10:00:05 UTC (rev 2557)
@@ -90,16 +90,6 @@
         </div>
         <div class="HPlaceholder5px"></div>
         <div class="HPlaceholder5px"></div>
-        <div class="HPlaceholder5px"></div>
-        <div class="Label">
-            <table cellspacing="0" cellpadding="0">
-                <tr>
-                    <td><input type="checkbox" id="AdvancedOptionsCheckBox" onclick="setAdvancedOptionsUI(this.checked)" /></td>
-                    <td><label for="AdvancedOptionsCheckBox">__#QUICKPLOT_ADVANCED_OPTIONS#__</label></td>
-                </tr>
-            </table>
-        </div>
-        <div class="HPlaceholder5px"></div>
         <div class="Label">__#QUICKPLOT_PAPER_SIZE#__</div>
         <div class="Ctrl">
             <!--
@@ -115,10 +105,31 @@
             </select>
         </div>
         <input type="hidden" id="paperSize" name="paperSize" />
-        
+        <div class="HPlaceholder5px"></div> 
+        <div class="HPlaceholder5px"></div>       
+        <div class="Label">__#QUICKPLOT_ORIENTATION#__</div>
+        <div class="Ctrl">
+            <!--
+                The pre-defined scales. The value for each "option" item is the scale denominator.
+                We can change the html code to extend the pre-defined scales
+            -->
+            <select class="FixWidth" name="OrientationList" id="OrientationList" onchange="drawCaptureBox(this)">
+                <option value="P">__#QUICKPLOT_ORIENTATION_P#__</option>
+                <option value="L">__#QUICKPLOT_ORIENTATION_L#__</option>
+            </select>
+        </div>
+        <input type="hidden" id="orientation" name="orientation" /> 
         <div class="HPlaceholder5px"></div>
         <div class="HPlaceholder5px"></div>
-
+        <div class="HPlaceholder5px"></div>
+        <div class="Label">
+            <table cellspacing="0" cellpadding="0">
+                <tr>
+                    <td><input type="checkbox" id="AdvancedOptionsCheckBox" onclick="setAdvancedOptionsUI(this.checked)" /></td>
+                    <td><label for="AdvancedOptionsCheckBox">__#QUICKPLOT_ADVANCED_OPTIONS#__</label></td>
+                </tr>
+            </table>
+        </div>
         <div class="Label">__#QUICKPLOT_SCALING#__</div>
         <div class="Ctrl">
             <!--
@@ -133,7 +144,6 @@
             </select>
         </div>
         <input type="hidden" id="scaleDenominator" name="scaleDenominator" />
-        
         <div class="Label" id="DPILabel">__#QUICKPLOT_DPI#__</div>
         <div class="Ctrl" id="DPICtrl">
             <!--
@@ -147,23 +157,8 @@
                 <option value="600">600</option>
             </select>
         </div>
-        <input type="hidden" id="dpi" name="dpi" />
-        
+        <input type="hidden" id="dpi" name="dpi" /> 
         <div class="HPlaceholder5px"></div>
-        <div class="HPlaceholder5px"></div>        
-
-        <div class="Label">__#QUICKPLOT_ORIENTATION#__</div>
-        <div class="Ctrl">
-            <!--
-                The pre-defined scales. The value for each "option" item is the scale denominator.
-                We can change the html code to extend the pre-defined scales
-            -->
-            <select class="FixWidth" name="OrientationList" id="OrientationList" onchange="drawCaptureBox(this)">
-                <option value="P">__#QUICKPLOT_ORIENTATION_P#__</option>
-                <option value="L">__#QUICKPLOT_ORIENTATION_L#__</option>
-            </select>
-        </div>
-        <input type="hidden" id="orientation" name="orientation" /> 
         <div class="HPlaceholder5px"></div>
         <div class="HPlaceholder5px"></div>
         <div class="ButtonContainer FixWidth">