[fusion-commits] r2792 - in trunk/widgets/Redline: . classes templates

[svn_fusion at osgeo.org]

Author: jng
Date: 2013-09-19 22:40:53 -0700 (Thu, 19 Sep 2013)
New Revision: 2792

Modified:
   trunk/widgets/Redline/classes/markupmanager.php
   trunk/widgets/Redline/editmarkupstyle.php
   trunk/widgets/Redline/templates/markuplayerdefinition_advanced.xml
Log:
#595: Support the label style component of redline labels under Advanced Stylization.

Modified: trunk/widgets/Redline/classes/markupmanager.php
===================================================================
--- trunk/widgets/Redline/classes/markupmanager.php	2013-09-20 05:00:15 UTC (rev 2791)
+++ trunk/widgets/Redline/classes/markupmanager.php	2013-09-20 05:40:53 UTC (rev 2792)
@@ -614,6 +614,15 @@
             $markupLayerDefinition = str_replace("#{FILL_PATTERN_TEMPLATE}", MarkupManager::GetFillPatternTemplate($this->args['FILLPATTERN']), $markupLayerDefinition);
             $markupLayerDefinition = str_replace("#{BORDER_PATTERN_TEMPLATE}", MarkupManager::GetBorderPatternGeometry($this->args['BORDERPATTERN']), $markupLayerDefinition);
             
+            if (strcmp($this->args["LABELBACKSTYLE"], "Opaque") == 0) {
+                $markupLayerDefinition = str_replace("#{FRAME_FILL_COLOR}", "0xffffffff", $markupLayerDefinition);
+            } else {
+                $markupLayerDefinition = str_replace("#{FRAME_FILL_COLOR}", "", $markupLayerDefinition);
+                if (strcmp($this->args["LABELBACKSTYLE"], "Transparent") == 0) {
+                    $labelBackColor = "";
+                }
+            }
+            
             //Then do a find/replace of all known tokens
             $markupLayerDefinition = str_replace("#{RESOURCE_ID}", $featureSourceId, $markupLayerDefinition);
             $markupLayerDefinition = str_replace("#{FEATURE_CLASS}", $className, $markupLayerDefinition);

Modified: trunk/widgets/Redline/editmarkupstyle.php
===================================================================
--- trunk/widgets/Redline/editmarkupstyle.php	2013-09-20 05:00:15 UTC (rev 2791)
+++ trunk/widgets/Redline/editmarkupstyle.php	2013-09-20 05:40:53 UTC (rev 2792)
@@ -465,7 +465,6 @@
             <br>
         </td>
     </tr>
-    <? if (!$isAdvanced) { ?>
     <tr>
         <td colspan="2">
             <?=$labelBackgroundStyleLocal?><br>
@@ -476,9 +475,6 @@
             </select>
         </td>
     </tr>
-    <? } else { ?>
-    <input name="LABELBACKSTYLE" size="1" style="display:none" />
-    <? } ?>
     <tr>
         <td colspan="2" align="right">
             <hr>

Modified: trunk/widgets/Redline/templates/markuplayerdefinition_advanced.xml
===================================================================
--- trunk/widgets/Redline/templates/markuplayerdefinition_advanced.xml	2013-09-20 05:00:15 UTC (rev 2791)
+++ trunk/widgets/Redline/templates/markuplayerdefinition_advanced.xml	2013-09-20 05:40:53 UTC (rev 2792)
@@ -377,7 +377,7 @@
                 <Override>
                   <SymbolName>MTEXT</SymbolName>
                   <ParameterIdentifier>FRAMEFILLCOLOR</ParameterIdentifier>
-                  <ParameterValue>0xffffffff</ParameterValue>
+                  <ParameterValue>#{FRAME_FILL_COLOR}</ParameterValue>
                 </Override>
                 <Override>
                   <SymbolName>MTEXT</SymbolName>
@@ -656,7 +656,7 @@
                 <Override>
                   <SymbolName>MTEXT</SymbolName>
                   <ParameterIdentifier>FRAMEFILLCOLOR</ParameterIdentifier>
-                  <ParameterValue>0xffffffff</ParameterValue>
+                  <ParameterValue>#{FRAME_FILL_COLOR}</ParameterValue>
                 </Override>
                 <Override>
                   <SymbolName>MTEXT</SymbolName>
@@ -973,7 +973,7 @@
                 <Override>
                   <SymbolName>MTEXT</SymbolName>
                   <ParameterIdentifier>FRAMEFILLCOLOR</ParameterIdentifier>
-                  <ParameterValue>0xffffffff</ParameterValue>
+                  <ParameterValue>#{FRAME_FILL_COLOR}</ParameterValue>
                 </Override>
                 <Override>
                   <SymbolName>MTEXT</SymbolName>